diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 12:54:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 12:54:15 +0200 |
| commit | c7e54628e30acbe896f92c8b8d89ae63901834ff (patch) | |
| tree | 67307ec7145d058d3267cbb47e4eccb6b23b6ba9 /libavformat/version.h | |
| parent | a40c338a00a4e1c7f2cce189db0f406f85d5792a (diff) | |
| parent | 95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7 (diff) | |
Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'
* commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7':
oggenc: Support flushing the muxer
Conflicts:
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 6f7aa7d31e..47b22b5156 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 42 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |