[SCM] libav/experimental: remove workaround which is no longer needed due to AVCodecContext.request_channels

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bd03aa1556ffeb490fc28794859acd8ef50abbe2
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Thu Jan 3 22:41:59 2008 +0000

    remove workaround which is no longer needed due to
    AVCodecContext.request_channels
    
    Originally committed as revision 11386 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index fc6249e..f384a0a 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -60,14 +60,7 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
                     s->frame_size = len;
                     /* update codec info */
                     avctx->sample_rate = sample_rate;
-                    /* set channels,except if the user explicitly requests 1 or 2 channels, XXX/FIXME this is a bit ugly */
-                    if(avctx->codec_id == CODEC_ID_AC3){
-                        if(avctx->channels!=1 && avctx->channels!=2){
-                            avctx->channels = channels;
-                        }
-                    } else {
                         avctx->channels = channels;
-                    }
                     avctx->bit_rate = bit_rate;
                     avctx->frame_size = samples;
                 }

-- 
Libav/FFmpeg packaging