diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:44:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 11:44:25 +0200 |
| commit | e1acfd3cb0543815316ede06232d13e002562daa (patch) | |
| tree | ae93002655c896f4873bd1a5fa8d6f22e0659cef /libavformat/version.h | |
| parent | d169b56b7bfc44c80261b7a2ec74f279cd853966 (diff) | |
| parent | b886f5c2f1e71b3e60e4265c500158d392b4b9a4 (diff) | |
| download | ffmpeg-e1acfd3cb0543815316ede06232d13e002562daa.tar.gz | |
Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'
* commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4':
mkv: Allow flushing the current cluster in progress
Conflicts:
libavformat/matroskaenc.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 731f8005d8..112401a96b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 13 -#define LIBAVFORMAT_VERSION_MICRO 103 +#define LIBAVFORMAT_VERSION_MINOR 14 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |