diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-15 23:01:26 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-15 23:01:26 +0000 |
| commit | d80a7fe50aa5cde9a5e14fe9cbef8362cc9abe3e (patch) | |
| tree | 511a8a84643e273c56e32a52c6a9af1ac8432b51 /libavutil | |
| parent | 2f5421d513ea2e65749c9bfaf03514b3ffc3d6d1 (diff) | |
move NULL_IF_CONFIG_SMALL() definition into internal header
Originally committed as revision 16619 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/common.h | 11 | ||||
| -rw-r--r-- | libavutil/internal.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index a8fd922145..ed295cfce3 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -323,15 +323,4 @@ static inline av_pure int ff_get_fourcc(const char *s){ }\ } -/** - * Returns NULL if CONFIG_SMALL is true otherwise the argument - * without modifications, used to disable the definition of strings - * (for example AVCodec long_names). - */ -#if CONFIG_SMALL -# define NULL_IF_CONFIG_SMALL(x) NULL -#else -# define NULL_IF_CONFIG_SMALL(x) x -#endif - #endif /* AVUTIL_COMMON_H */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 78bfdd828a..ef1233d91c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -302,4 +302,15 @@ static av_always_inline av_const float truncf(float x) } #endif /* HAVE_TRUNCF */ +/** + * Returns NULL if CONFIG_SMALL is true otherwise the argument + * without modifications, used to disable the definition of strings + * (for example AVCodec long_names). + */ +#if CONFIG_SMALL +# define NULL_IF_CONFIG_SMALL(x) NULL +#else +# define NULL_IF_CONFIG_SMALL(x) x +#endif + #endif /* AVUTIL_INTERNAL_H */ |