[FFmpeg-cvslog] r11386 - trunk/libavcodec/aac_ac3_parser.c

[Michael Niedermayer]

On Thu, Jan 03, 2008 at 06:22:42PM -0500, Justin Ruggles wrote:
> jbr wrote:
> > Author: jbr
> > Date: Thu Jan  3 23:41:59 2008
> > New Revision: 11386
> > 
> > Log:
> > remove workaround which is no longer needed due to
> > AVCodecContext.request_channels
> > 
> > Modified:
> >    trunk/libavcodec/aac_ac3_parser.c
> > 
> > Modified: trunk/libavcodec/aac_ac3_parser.c
> > ==============================================================================
> > --- trunk/libavcodec/aac_ac3_parser.c	(original)
> > +++ trunk/libavcodec/aac_ac3_parser.c	Thu Jan  3 23:41:59 2008
> > @@ -60,14 +60,7 @@ int ff_aac_ac3_parse(AVCodecParserContex
> >                      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;
> >                  }
> 
> Should the parser check for request_channels?  Right now the value of
> AVCodecContext.channels changes back and forth between the stream value,
> as set by the parser, and the requested value, as set by the decoder.

hmm, yes it should check, its ugly but randomizing the variable is worse

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20080104/bc5bb919/attachment.pgp>