check for request_channels in dca init function

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

1 files changed, 7 insertions, 0 deletions

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 0bfc294d71..9d373e225b 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1230,6 +1230,13 @@ static int dca_decode_init(AVCodecContext * avctx)
     pre_calc_cosmod(s);
 
     dsputil_init(&s->dsp, avctx);
+
+    /* allow downmixing to stereo */
+    if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
+            avctx->request_channels == 2) {
+        avctx->channels = avctx->request_channels;
+    }
+
     return 0;
 }