From 16123f1b8e832ad1743e9ab24bd7c7663411bfa4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 30 Nov 2009 09:59:05 +0100
Subject: [PATCH] ffmpeg: don't try to force stereo

The plugin code tried to force libavcodec to supply stereo samples.
That however has never actually worked.  By removing this code, we are
able to play surround files for the first time.
---
 NEWS                        | 2 ++
 src/decoder/ffmpeg_plugin.c | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 6b6944c1b..e566504d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.15.7 (2009/??/??)
+* decoders:
+  - ffmpeg: don't try to force stereo
 
 
 ver 0.15.6 (2009/11/18)
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index b9aafaf7b..86c20a882 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -289,10 +289,6 @@ ffmpeg_decode_internal(struct ffmpeg_context *ctx)
 
 	total_time = 0;
 
-	if (codec_context->channels > 2) {
-		codec_context->channels = 2;
-	}
-
 #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(41<<8)+0)
 	audio_format.bits = (uint8_t) av_get_bits_per_sample_format(codec_context->sample_fmt);
 #else