diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 16:16:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 16:16:41 +0100 |
| commit | b14517d3cd3787f3c399f3ca7faf1a99a1066ff8 (patch) | |
| tree | 368cc144be79c3c7c4ef1a146c73b2ea19e53c64 /libavfilter/version.h | |
| parent | 130c33af35c5d8798f70c62586ab228d4f8cd2a2 (diff) | |
| parent | 35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4 (diff) | |
| download | ffmpeg-b14517d3cd3787f3c399f3ca7faf1a99a1066ff8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 5dbea058b0..ad47466ad0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 4 #define LIBAVFILTER_VERSION_MINOR 1 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MICRO 103 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -88,5 +88,8 @@ #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 */ |