check for request_channels in dca init function
authorJustin Ruggles <justin.ruggles@gmail.com>
Sat, 5 Jan 2008 21:23:57 +0000 (21:23 +0000)
committerJustin Ruggles <justin.ruggles@gmail.com>
Sat, 5 Jan 2008 21:23:57 +0000 (21:23 +0000)
Originally committed as revision 11423 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/dca.c

index 0bfc294..9d373e2 100644 (file)
@@ -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;
 }