diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:39:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:39:28 +0200 |
| commit | c87f645a757e1888932a57a2b5ef8ca44098a9e0 (patch) | |
| tree | 01d1b71ca3256b049a7cee0f0ae91f651a226988 /libavfilter/version.h | |
| parent | 79d0e164cfef96d77cca5b056fcf097a4c63a28e (diff) | |
| parent | 52269f48e835a52023656f8330262ae70e6061c4 (diff) | |
| download | ffmpeg-c87f645a757e1888932a57a2b5ef8ca44098a9e0.tar.gz | |
Merge commit '52269f48e835a52023656f8330262ae70e6061c4'
* commit '52269f48e835a52023656f8330262ae70e6061c4':
Revert "vf_interlace: deprecate lowpass option"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 9f2c36494c..1a43dc51a9 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -88,8 +88,5 @@ #ifndef FF_API_NOCONST_GET_NAME #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 5) #endif -#ifndef FF_API_INTERLACE_LOWPASS_SET -#define FF_API_INTERLACE_LOWPASS_SET (LIBAVFILTER_VERSION_MAJOR < 5) -#endif #endif /* AVFILTER_VERSION_H */ |