do not set channels before checking request_channels

Originally committed as revision 11418 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · 3eca1e6fad
parent dc7009ea1b
commit 3eca1e6fad
1 changed files with 2 additions and 1 deletions
--- 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;
                }