# HG changeset patch
# User takis
# Date 1212305863 0
# Node ID 8c5bd100bb3057d6510b2235502d6bd032789d4f
# Parent  3ac9085839f0c18c53f30050529cb0cf4b0f5892
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

diff -r 3ac9085839f0 -r 8c5bd100bb30 avutil.h
--- a/avutil.h	Fri May 30 10:58:48 2008 +0000
+++ b/avutil.h	Sun Jun 01 07:37:43 2008 +0000
@@ -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 -r 3ac9085839f0 -r 8c5bd100bb30 common.h
--- a/common.h	Fri May 30 10:58:48 2008 +0000
+++ b/common.h	Sun Jun 01 07:37:43 2008 +0000
@@ -387,4 +387,15 @@
 #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 */