[FFmpeg-cvslog] r11418 - trunk/libavcodec/liba52.c

[jbr]

Author: jbr
Date: Sat Jan  5 17:47:40 2008
New Revision: 11418

Log:
do not set channels before checking request_channels

Modified:
   trunk/libavcodec/liba52.c

Modified: trunk/libavcodec/liba52.c
==============================================================================
--- trunk/libavcodec/liba52.c	(original)
+++ trunk/libavcodec/liba52.c	Sat Jan  5 17:47:40 2008
@@ -186,11 +186,12 @@ static int a52_decode_frame(AVCodecConte
                     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;
                 }