[FFmpeg-cvslog] r17773 - trunk/libavcodec/libfaad.c

[Stefano Sabatini]

On date Wednesday 2009-03-04 00:19:10 +0100, Stefano Sabatini wrote:
> On date Tuesday 2009-03-03 16:48:53 +0100, diego wrote:
> > Author: diego
> > Date: Tue Mar  3 16:48:52 2009
> > New Revision: 17773
> > 
> > Log:
> > Do not use a macro to generate a single AVCodec declaration.
> 
> This brokes compilation here.
>  
> > Modified:
> >    trunk/libavcodec/libfaad.c
> > 
> > Modified: trunk/libavcodec/libfaad.c
> > ==============================================================================
> > --- trunk/libavcodec/libfaad.c	Tue Mar  3 16:35:20 2009	(r17772)
> > +++ trunk/libavcodec/libfaad.c	Tue Mar  3 16:48:52 2009	(r17773)
> > @@ -318,20 +318,14 @@ static av_cold int faac_decode_init(AVCo
> >      return 0;
> >  }
> >  
> > -#define AAC_CODEC(id, name, long_name_) \
> > -AVCodec name ## _decoder = {    \
> > -    #name,                      \
> > -    CODEC_TYPE_AUDIO,           \
> > -    id,                         \
> > -    sizeof(FAACContext),        \
> > -    faac_decode_init,           \
> > -    NULL,                       \
> > -    faac_decode_end,            \
> > -    faac_decode_frame,          \
> > -    .long_name = NULL_IF_CONFIG_SMALL(long_name_), \
> > +AVCodec libfaad_decoder = {
> > +    libfaad,
> 
> "libfaad"
> 
> > +    CODEC_TYPE_AUDIO,
> > +    CODEC_ID_AAC,
> > +    sizeof(FAACContext),
> > +    faac_decode_init,
> > +    NULL,
> > +    faac_decode_end,
> > +    faac_decode_frame,
> > +    .long_name = NULL_IF_CONFIG_SMALL("libfaad AAC (Advanced Audio Codec)"),
> >  }
> 
> missing ";"
> 
> > -
> > -// FIXME - raw AAC files - maybe just one entry will be enough
> > -AAC_CODEC(CODEC_ID_AAC, libfaad, "libfaad AAC (Advanced Audio Codec)");
> > -
> > -#undef AAC_CODEC

Should be fixed now, regards.