diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 15:31:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 15:34:24 +0100 |
| commit | 58770db2ae67d9b4b6adcf2b15951f9608442051 (patch) | |
| tree | a155b0f27369b59cfa7651a4a1ecd6627d3d8a58 /libavformat/version.h | |
| parent | 5049b6a1fe52f549bad6721f162b4ec2d9d0a357 (diff) | |
| parent | 33018907bd07b34e0e70d5ae12097265eb3734d7 (diff) | |
| download | ffmpeg-58770db2ae67d9b4b6adcf2b15951f9608442051.tar.gz | |
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
mp3enc: allow omitting the id3v2 header with -id3v2_version 0
Conflicts:
doc/muxers.texi
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 3ccbf4c408..40c56c9669 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 23 -#define LIBAVFORMAT_VERSION_MICRO 103 +#define LIBAVFORMAT_VERSION_MINOR 24 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |