diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 00:34:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 00:34:36 +0200 |
| commit | 5916bc46581230c68c946c0b4733cce381eddcbd (patch) | |
| tree | 016c3ddabcec1e8ff2b50a375d9377eb31319842 /libavfilter/version.h | |
| parent | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (diff) | |
| parent | 1961e46c15c23a041f8d8614a25388a3ee9eff63 (diff) | |
Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'
* commit '1961e46c15c23a041f8d8614a25388a3ee9eff63':
lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
lavfi: use proper FF_API guards for different deprecated functions
lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
lavfi: remove disabled FF_API_SAMPLERATE64 cruft
lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft
Conflicts:
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/video.c
libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 4e4286a997..124348d41e 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -47,21 +47,6 @@ #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 -#ifndef FF_API_SAMPLERATE64 -#define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3) -#endif -#ifndef FF_API_VSRC_BUFFER_ADD_FRAME -#define FF_API_VSRC_BUFFER_ADD_FRAME (LIBAVFILTER_VERSION_MAJOR < 3) -#endif -#ifndef FF_API_DEFAULT_CONFIG_OUTPUT_LINK -#define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3) -#endif -#ifndef FF_API_FILTERS_PUBLIC -#define FF_API_FILTERS_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 3) -#endif #ifndef FF_API_AVFILTERPAD_PUBLIC #define FF_API_AVFILTERPAD_PUBLIC (LIBAVFILTER_VERSION_MAJOR < 4) #endif |