Commit 3eca1e6f authored by Justin Ruggles's avatar Justin Ruggles

do not set channels before checking request_channels

Originally committed as revision 11418 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent dc7009ea
......@@ -186,11 +186,12 @@ static int a52_decode_frame(AVCodecContext *avctx,
s->channels = ac3_channels[s->flags & 7];
if (s->flags & A52_LFE)
s->channels++;
avctx->channels = s->channels;
if (avctx->request_channels > 0 &&
avctx->request_channels <= 2 &&
avctx->request_channels < s->channels) {
avctx->channels = avctx->request_channels;
} else {
avctx->channels = s->channels;
}
avctx->bit_rate = bit_rate;
}
......
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