From 4a567b40b173542a9d009b6a9ddb0c800fe98bb7 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 1 Jun 2008 07:37:43 +0000
Subject: [PATCH] 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
---
libavutil/avutil.h | 2 +-
libavutil/common.h | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 1e84557cda2..6ce70ac5b9e 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 45c059b39c6..5b830d06458 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 */
--
GitLab