diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:18:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 11:27:02 +0100 |
commit | 5d166de25853a41c6e2e2067f253271f22f94098 (patch) | |
tree | f59bfda9ef35996ccf4b9a05bfb746bc46410b5a /libavfilter/version.h | |
parent | 96fc2908f0c04d2759d6c20275150d65798de4ac (diff) | |
parent | 738f83582a3aaabb81309eacd4ab9c3d2acb4071 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
-rw-r--r-- | libavfilter/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index ad47466ad0..a33ab490d0 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 4 -#define LIBAVFILTER_VERSION_MINOR 1 -#define LIBAVFILTER_VERSION_MICRO 103 +#define LIBAVFILTER_VERSION_MINOR 2 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |