diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:19:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:19:45 +0200 |
| commit | 3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4 (patch) | |
| tree | 4f0c33c423c6ef6929256e946b5bfd23cf251a11 /libavfilter/version.h | |
| parent | 499ff6a052591d980ed36e10ac2019cef14c302b (diff) | |
| parent | f4c444e17d137c786f0ed2da0e5943df505d5f9e (diff) | |
Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
Postpone API-incompatible changes until the next bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index dfc305b4ed..632e90448d 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -50,10 +50,10 @@ */ #ifndef FF_API_AVFILTERPAD_PUBLIC -#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_FOO_COUNT -#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_FILL_FRAME #define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 5) @@ -62,22 +62,22 @@ #define FF_API_BUFFERSRC_BUFFER (LIBAVFILTER_VERSION_MAJOR < 5) #endif #ifndef FF_API_AVFILTERBUFFER -#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_OLD_FILTER_OPTS -#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_ACONVERT_FILTER #define FF_API_ACONVERT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5) #endif #ifndef FF_API_AVFILTER_OPEN -#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_AVFILTER_INIT_FILTER -#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_OLD_FILTER_REGISTER -#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 6) #endif #ifndef FF_API_OLD_GRAPH_PARSE #define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 5) @@ -86,7 +86,7 @@ #define FF_API_DRAWTEXT_OLD_TIMELINE (LIBAVFILTER_VERSION_MAJOR < 5) #endif #ifndef FF_API_NOCONST_GET_NAME -#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 5) +#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 6) #endif #endif /* AVFILTER_VERSION_H */ |