diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:56:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 12:06:15 +0200 |
commit | 04ee57ce0aba34722e47419fce5977f81ea09d07 (patch) | |
tree | 09ae488114b194c24303a226c831fc0d2eb25206 /libavformat/version.h | |
parent | 018e0db5eff21d2b7e546bc63f4807dea782d00d (diff) | |
parent | bb461370e34b1fa1637f34ce7d37b934ddb472d5 (diff) |
Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
* commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5':
asfenc: mux chapters in ASF files using an ASF "marker" section
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
-rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index fb82f3483d..44c2fca3cd 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 18 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |