>2 channels decoding fix

Originally committed as revision 3086 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 027e0b9bf8805b511ad1e8988a8c3627d736da59..851bac3be2b834a1cdbb5e97d7e5a718a7f86d28 100644 (file)
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -877,9 +877,12 @@ static int ac3_parse(AVCodecParserContext *s1,
                    s->frame_size = len;
                     /* update codec info */
                     avctx->sample_rate = sample_rate;
-                    avctx->channels = ac3_channels[s->flags & 7];
-                    if (s->flags & A52_LFE)
-                       avctx->channels++;
+                    /* set channels,except if the user explicitly requests 1 or 2 channels, XXX/FIXME this is a bit ugly */
+                    if(avctx->channels!=1 && avctx->channels!=2){
+                        avctx->channels = ac3_channels[s->flags & 7];
+                        if (s->flags & A52_LFE)
+                            avctx->channels++;
+                    }
                    avctx->bit_rate = bit_rate;
                     avctx->frame_size = 6 * 256;
                 }