check for request_channels at codec init

Originally committed as revision 11415 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 7 insertions, 0 deletions

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 5c09a2e40d..314eaa0624 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -312,6 +312,13 @@ static int ac3_decode_init(AVCodecContext *avctx)
         s->mul_bias = 32767.0f;
     }
 
+    /* allow downmixing to stereo or mono */
+    if (avctx->channels > 0 && avctx->request_channels > 0 &&
+            avctx->request_channels < avctx->channels &&
+            avctx->request_channels <= 2) {
+        avctx->channels = avctx->request_channels;
+    }
+
     return 0;
 }