diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:20:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:20:55 +0200 |
| commit | cb20ca14a330ade01cb73c340976b86933e34c7d (patch) | |
| tree | f9f4e424cd810588fee5b58ef9c0b738dd430a2e /libavfilter | |
| parent | d7e8b3d83179b811764660f5613905f7eb726291 (diff) | |
| parent | 2e81acc687e64d15dd93c74793060bb5a233f44d (diff) | |
| download | ffmpeg-cb20ca14a330ade01cb73c340976b86933e34c7d.tar.gz | |
Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d':
x86inc: Fix number of operands for cmp* instructions
af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a
lavfi: add a bump and docs entries for the AVOptions switch
Conflicts:
Changelog
doc/APIchanges
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -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 171a9adb7b..3481d0c7f2 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,8 +29,8 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 3 -#define LIBAVFILTER_VERSION_MINOR 50 -#define LIBAVFILTER_VERSION_MICRO 103 +#define LIBAVFILTER_VERSION_MINOR 51 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |