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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13595 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 1e84557cda24978dc6e95efc0ee6adec7cda1f07..6ce70ac5b9ed59dfafc48af6ecf184681ef067f8 100644 (file)
--- 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 45c059b39c60efdb7fc0adc22810a4f59fb9a22d..5b830d06458d71e95960b3eb38ff323903ef64ce 100644 (file)
--- 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 */