diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 12:51:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 13:07:20 +0100 |
| commit | 2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a (patch) | |
| tree | 675b3b2b0a1fe5cc983c1d0042ccd55edf5aedc4 /libavfilter/version.h | |
| parent | b76059058aa6ca89836d450b7b07797ebc2d69ec (diff) | |
| parent | 599b81ca9a8e04a27ddad94af462171d16063167 (diff) | |
| download | ffmpeg-2fb0027c267dfaa1d6d1f16ebd735c00f99c0d8a.tar.gz | |
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
lavfi: add shuffleplanes filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
| -rw-r--r-- | libavfilter/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index a33ab490d0..ac1dac68d1 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 4 -#define LIBAVFILTER_VERSION_MINOR 2 +#define LIBAVFILTER_VERSION_MINOR 3 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |