[FFmpeg-devel] [PATCH] lavfi: move some FF_API_ definitions from avfilter.h to version.h

[Stefano Sabatini]

version.h seems the right place for FF_API_ definitions.
---
 libavfilter/avfilter.h |    8 --------
 libavfilter/version.h  |    6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 3c7af2d..d439ac8 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -29,14 +29,6 @@
 #include "libavutil/rational.h"
 #include "libavcodec/avcodec.h"
 
-
-#ifndef FF_API_OLD_VSINK_API
-#define FF_API_OLD_VSINK_API        (LIBAVFILTER_VERSION_MAJOR < 3)
-#endif
-#ifndef FF_API_OLD_ALL_FORMATS_API
-#define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3)
-#endif
-
 #include <stddef.h>
 
 #include "libavfilter/version.h"
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 221a0de..8e12295 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -44,6 +44,12 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
+#ifndef FF_API_OLD_VSINK_API
+#define FF_API_OLD_VSINK_API        (LIBAVFILTER_VERSION_MAJOR < 3)
+#endif
+#ifndef FF_API_OLD_ALL_FORMATS_API
+#define FF_API_OLD_ALL_FORMATS_API (LIBAVFILTER_VERSION_MAJOR < 3)
+#endif
 #ifndef FF_API_GRAPH_AVCLASS
 #define FF_API_GRAPH_AVCLASS            (LIBAVFILTER_VERSION_MAJOR > 2)
 #endif
-- 
1.7.5.4