diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-06-22 12:46:51 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-25 13:42:29 +0200 |
| commit | a31ab5071246768976923de3b318b57312b7ad9b (patch) | |
| tree | d79643cb18e669e18d07fea7ec8a499ba78d6de1 /libavfilter | |
| parent | 5fd3e6965e58aee59e9bf26e38e2a3925535ab21 (diff) | |
| download | ffmpeg-a31ab5071246768976923de3b318b57312b7ad9b.tar.gz | |
lavfi: move some FF_API_ definitions from avfilter.h to version.h
version.h seems the right place for FF_API_ definitions.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 8 | ||||
| -rw-r--r-- | libavfilter/version.h | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index d0a259c22e..5324cc5f22 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 ab32f29a03..a5aa29ce07 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 |