From 3eca1e6fad56f295fb1ef67cb70aff37ff4936a4 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sat, 5 Jan 2008 16:47:40 +0000 Subject: do not set channels before checking request_channels Originally committed as revision 11418 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/liba52.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/liba52.c') diff --git a/libavcodec/liba52.c b/libavcodec/liba52.c index d8065ef14c..f366a3f5b1 100644 --- a/libavcodec/liba52.c +++ b/libavcodec/liba52.c @@ -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; } -- cgit v1.2.3