[FFmpeg-devel] [PATCH] Make long_names definition conditional depending on CONFIG_SMALL

[Stefano Sabatini]

On date Thursday 2008-06-12 15:59:09 +0200, Michael Niedermayer encoded:
> On Sun, Jun 08, 2008 at 05:46:59PM +0200, Stefano Sabatini wrote:
> > On date Sunday 2008-06-08 16:18:59 +0200, Michael Niedermayer encoded:
> > > On Sat, Jun 07, 2008 at 11:31:54AM +0200, Stefano Sabatini wrote:
> > [...]
> > > > Index: libavcodec/avcodec.h
> > > > ===================================================================
> > > > --- libavcodec/avcodec.h	(revision 13684)
> > > > +++ libavcodec/avcodec.h	(working copy)
> > > > @@ -2242,7 +2242,11 @@
> > > >      void (*flush)(AVCodecContext *);
> > > >      const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
> > > >      const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
> > > > -    const char *long_name;                  ///< descriptive name for the codec, meant to be more human readable than \p name
> > > > +    /**
> > > > +     * descriptive name for the codec, meant to be more human readable than \p name<br>
> > > > +     * You \e should use the NULL_IF_CONFIG_SMALL() macro to define it.
> > > > +     */
> > > > +    const char *long_name;
> > > >      const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
> > > >  } AVCodec;
> > > 
> > > s/<br>/./
> > 
> > mmh...
> > 
> > <rant>
> > Please guys tell me once and forever what you prefer, I'm using
> > the form suggested by Michael (plus Capitalization) as in libavformat,
> > but I still can't understand which is the rule to apply here if there
> > is one and every file has a different style when it has a consistent
> > one so we can end up discussing these issues ab eternis...
> > </rant>
> >  
> > > [...]
> > > > -    .long_name = XXX
> > > > +    .long_name = NULL_IF_CONFIG_SMALL(XXX),
> > > 
> > > ok
> > 
> > Regards.
> > -- 
> > FFmpeg = Frightening and Faboulous MultiPurpose Extreme Garbage
> 
> > Index: libavcodec/avcodec.h
> > ===================================================================
> > --- libavcodec/avcodec.h	(revision 13711)
> > +++ libavcodec/avcodec.h	(working copy)
> > @@ -2242,7 +2242,11 @@
> >      void (*flush)(AVCodecContext *);
> >      const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
> >      const enum PixelFormat *pix_fmts;       ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
> > -    const char *long_name;                  ///< descriptive name for the codec, meant to be more human readable than \p name
> > +    /**
> > +     * Descriptive name for the codec, meant to be more human readable than \p name.
> > +     * You \e should use the NULL_IF_CONFIG_SMALL() macro to define it.
> > +     */
> > +    const char *long_name;
> >      const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
> >  } AVCodec;
> 
> iam fine with the change to avcodec.h
> 
> 
> > -    .long_name = "*",
> > +    .long_name = NULL_IF_CONFIG_SMALL("*"),
> 
> is ok as well

Applied.
-- 
FFmpeg = Foolish and Foolish MultiPurpose EnGine