From d80a7fe50aa5cde9a5e14fe9cbef8362cc9abe3e Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Thu, 15 Jan 2009 23:01:26 +0000
Subject: [PATCH] move NULL_IF_CONFIG_SMALL() definition into internal header
Originally committed as revision 16619 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavutil/common.h | 11 -----------
libavutil/internal.h | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/libavutil/common.h b/libavutil/common.h
index a8fd9221458..ed295cfce3b 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 78bfdd828a9..ef1233d91cb 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 */
--
GitLab