diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 13:23:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-18 13:32:55 +0200 |
| commit | b7e7d8cdaf3aafd9b79daa8f6ed827d05e3f8548 (patch) | |
| tree | fe49680e5686614c81dc0b959372f1c7c042d1db /libavformat/version.h | |
| parent | 394a73cad2ed0933a68f10ee720a641c7192fa15 (diff) | |
| parent | e7bf085b78586a04b918f4e76587779d04674700 (diff) | |
| download | ffmpeg-b7e7d8cdaf3aafd9b79daa8f6ed827d05e3f8548.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Add an option for omitting the tfhd base offset
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 e7d9417b9c..fb82f3483d 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 17 +#define LIBAVFORMAT_VERSION_MINOR 18 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |