diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 22:07:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 22:13:50 +0100 |
commit | b5b15c4dd943fdb9fe57675a8926510be305223e (patch) | |
tree | 30f5f63c75ba1f9d257260cf48738aa7b507949f /libavformat/version.h | |
parent | 9e0b0c60bd7fa4d4a476b93f94436a8e37d98983 (diff) | |
parent | fe5e6e34c05e274f98528be4f77f3c474473f977 (diff) |
Merge commit 'fe5e6e34c05e274f98528be4f77f3c474473f977'
* commit 'fe5e6e34c05e274f98528be4f77f3c474473f977':
lavf: Add an MPEG-DASH ISOFF segmenting muxer
Conflicts:
Changelog
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
-rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 2bad647788..a9e0ac2617 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 13 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 14 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |