diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-06-01 07:37:43 +0000 |
|---|---|---|
| committer | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2008-06-01 07:37:43 +0000 |
| commit | 4a567b40b173542a9d009b6a9ddb0c800fe98bb7 (patch) | |
| tree | c3c5ce4ef9bc4b70401dd92afbeecec371777e71 | |
| parent | b8b015f483665e7adadca6cad9adafa7af890af4 (diff) | |
| download | ffmpeg-4a567b40b173542a9d009b6a9ddb0c800fe98bb7.tar.gz | |
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
Originally committed as revision 13595 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/common.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 1e84557cda..6ce70ac5b9 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -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, \ diff --git a/libavutil/common.h b/libavutil/common.h index 45c059b39c..5b830d0645 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -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 + #endif /* FFMPEG_COMMON_H */ |