---
Useful to unbreak the deprecation messup.
libavutil/attributes.h | 30 ++++++++++++++++++++++++++++++
libavutil/internal.h | 30 ------------------------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index d7f2bb5..3193603 100644
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -123,4 +123,34 @@
# define av_noreturn
#endif
+#ifndef attribute_align_arg
+#if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
+# define attribute_align_arg __attribute__((force_align_arg_pointer))
+#else
+# define attribute_align_arg
+#endif
+#endif
+
+#if defined(_MSC_VER) && CONFIG_SHARED
+# define av_export __declspec(dllimport)
+#else
+# define av_export
+#endif
+
+#if HAVE_PRAGMA_DEPRECATED
+# if defined(__ICL)
+# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push))
__pragma(warning(disable:1478))
+# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop))
+# elif defined(_MSC_VER)
+# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push))
__pragma(warning(disable:4996))
+# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop))
+# else
+# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic
ignored \"-Wdeprecated-declarations\"")
+# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic
warning \"-Wdeprecated-declarations\"")
+# endif
+#else
+# define FF_DISABLE_DEPRECATION_WARNINGS
+# define FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
#endif /* AVUTIL_ATTRIBUTES_H */
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 4264c4e..7345684 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -47,36 +47,6 @@
# define emms_c()
#endif
-#ifndef attribute_align_arg
-#if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
-# define attribute_align_arg __attribute__((force_align_arg_pointer))
-#else
-# define attribute_align_arg
-#endif
-#endif
-
-#if defined(_MSC_VER) && CONFIG_SHARED
-# define av_export __declspec(dllimport)
-#else
-# define av_export
-#endif
-
-#if HAVE_PRAGMA_DEPRECATED
-# if defined(__ICL)
-# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push))
__pragma(warning(disable:1478))
-# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop))
-# elif defined(_MSC_VER)
-# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push))
__pragma(warning(disable:4996))
-# define FF_ENABLE_DEPRECATION_WARNINGS __pragma(warning(pop))
-# else
-# define FF_DISABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic
ignored \"-Wdeprecated-declarations\"")
-# define FF_ENABLE_DEPRECATION_WARNINGS _Pragma("GCC diagnostic
warning \"-Wdeprecated-declarations\"")
-# endif
-#else
-# define FF_DISABLE_DEPRECATION_WARNINGS
-# define FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
// Some broken preprocessors need a second expansion
// to be forced to tokenize __VA_ARGS__
#define E1(x) x
--
1.9.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
