Commit cfec09e9 authored by Justin Ruggles's avatar Justin Ruggles

check for request_channels in dca init function

Originally committed as revision 11423 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ef7f2bb7
...@@ -1230,6 +1230,13 @@ static int dca_decode_init(AVCodecContext * avctx) ...@@ -1230,6 +1230,13 @@ static int dca_decode_init(AVCodecContext * avctx)
pre_calc_cosmod(s); pre_calc_cosmod(s);
dsputil_init(&s->dsp, avctx); 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; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment