diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 14:14:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 14:14:10 +0200 |
| commit | 154d80eae70b73c683e70a157e73173aabb26a58 (patch) | |
| tree | 98854991ca12fbd5ddaebaa641919b978507088a /libavfilter/version.h | |
| parent | 7a0e689c4517d8e6ccec6027354bd827965a9ba2 (diff) | |
| parent | 1c0210c7981b6a61043d9171f506b435ff5a1f5e (diff) | |
| download | ffmpeg-154d80eae70b73c683e70a157e73173aabb26a58.tar.gz | |
Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'
* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
lavfi: add Bauer stereo-to-binaural audio filter
Conflicts:
Changelog
configure
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 1540d55bb0..7a6321e53e 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 4 +#define LIBAVFILTER_VERSION_MINOR 5 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |