lavfi: move some FF_API_ definitions from avfilter.h to version.h

version.h seems the right place for FF_API_ definitions.

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index d0a259c..5324cc5 100644 (file)
--- 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 ab32f29..a5aa29c 100644 (file)
--- 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