[FFmpeg-cvslog] r13595 - in trunk/libavutil: avutil.h common.h

[Måns Rullgård]

takis <subversion at mplayerhq.hu> writes:

> Author: takis
> Date: Sun Jun  1 09:37:43 2008
> New Revision: 13595
>
> Log:
> Macro suggested by Michael which will be used to disable the
> definition of long_name strings in libavcodec and libavformat.
> Patch by: Stefano Sabatini, stefano.sabatini-lala poste it 
>
> Modified:
>    trunk/libavutil/avutil.h
>    trunk/libavutil/common.h
>
> Modified: trunk/libavutil/avutil.h
> ==============================================================================
> --- trunk/libavutil/avutil.h	(original)
> +++ trunk/libavutil/avutil.h	Sun Jun  1 09:37:43 2008
> @@ -35,7 +35,7 @@
>  #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
>
>  #define LIBAVUTIL_VERSION_MAJOR 49
> -#define LIBAVUTIL_VERSION_MINOR  6
> +#define LIBAVUTIL_VERSION_MINOR  7
>  #define LIBAVUTIL_VERSION_MICRO  0
>
>  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
>
> Modified: trunk/libavutil/common.h
> ==============================================================================
> --- trunk/libavutil/common.h	(original)
> +++ trunk/libavutil/common.h	Sun Jun  1 09:37:43 2008
> @@ -387,4 +387,15 @@ tend= AV_READ_TIME();\
>  #define STOP_TIMER(id) {}
>  #endif
>
> +/**
> + * Returns NULL if CONFIG_SMALL is defined otherwise the argument
> + * without modifications, used to disable the definition of strings
> + * (for example AVCodec long_names).
> + */
> +#ifdef CONFIG_SMALL
> +#   define NULL_IF_CONFIG_SMALL(x) NULL
> +#else
> +#   define NULL_IF_CONFIG_SMALL(x) x
> +#endif
> +

This doesn't belong in an installed header file.  The CONFIG_*
settings are not available there, so it is pointless at best (in this
case), and can easily be harmful.  The correct place for things like
this is internal.h.

-- 
M?ns Rullg?rd
mans at mansr.com