From bd03aa1556ffeb490fc28794859acd8ef50abbe2 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 3 Jan 2008 22:41:59 +0000 Subject: remove workaround which is no longer needed due to AVCodecContext.request_channels Originally committed as revision 11386 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac_ac3_parser.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'libavcodec/aac_ac3_parser.c') diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index fc6249ede4..f384a0a3e8 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; } -- cgit v1.2.3