Mercurial > libavcodec.hg

changeset 6100:a5dee59b5918 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove workaround which is no longer needed due to AVCodecContext.request_channels
author jbr
date Thu, 03 Jan 2008 22:41:59 +0000
parents a2b438bcb1d2
children d6c599061072
files aac_ac3_parser.c
diffstat 1 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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;
                 }