# HG changeset patch
# User jbr
# Date 1199400119 0
# Node ID a5dee59b591845889b078277817328eea6289b02
# Parent  a2b438bcb1d23df58aba8be55ae5651d21e77207
remove workaround which is no longer needed due to
AVCodecContext.request_channels

diff -r a2b438bcb1d2 -r a5dee59b5918 aac_ac3_parser.c
--- a/aac_ac3_parser.c	Thu Jan 03 09:16:56 2008 +0000
+++ b/aac_ac3_parser.c	Thu Jan 03 22:41:59 2008 +0000
@@ -60,14 +60,7 @@
                     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;
                 }