[FFmpeg-devel] [PATCH 1/7] aacdec: add MPEG4AudioConfig as parameter for decode_audio_specific_config

[Janne Grunau]

On Fri, Oct 29, 2010 at 08:53:17AM +0200, Tomas H?rdin wrote:
> On Fri, 2010-10-29 at 00:44 +0200, Janne Grunau wrote:
> > This will be used by the latm decoder to avoid AACContext changes during
> > audio specific config parsing.
> > ---
> >  libavcodec/aacdec.c |   30 +++++++++++++++++-------------
> >  1 files changed, 17 insertions(+), 13 deletions(-)
> > 
> > diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
> > index 6138dac..efb40e0 100644
> > --- a/libavcodec/aacdec.c
> > +++ b/libavcodec/aacdec.c
> > [snip]
> > @@ -408,11 +409,12 @@ static int decode_ga_specific_config(AACContext *ac, GetBitContext *gb,
> >          if ((ret = set_default_channel_config(ac, new_che_pos, channel_config)))
> >              return ret;
> >      }
> > +    if (m4ac == &ac->m4ac)
> >      if ((ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config, OC_GLOBAL_HDR)))
> >          return ret;
> 
> Why not just add "m4ac == &ac->m4ac && " to the if? That way you don't
> need to reindent. Prettier too IMO.

indeed, changed and PATCH 2/7 dropped. thanks

Janne