diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-29 01:40:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-29 01:40:34 +0100 |
| commit | 6071e4d87a9b257c3f7b5912825ede9caa757624 (patch) | |
| tree | aeaad3a1d7eb0b27f20a66665740d2a96e99f7c2 /libavformat/version.h | |
| parent | 7e5cbb3c2d96c27d526aa69cbdbd1ab23739d7e5 (diff) | |
| parent | 8f5216905f88510c9a74cd91a424902aa989b9a1 (diff) | |
| download | ffmpeg-6071e4d87a9b257c3f7b5912825ede9caa757624.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Check for sufficient input data. Fixes crash
fate: Add v210 codec regression tests
mpegts: adjustable minimum PES payload
mpegts: properly output large audio packets
avformat: Add SMJPEG demuxer.
Indeo 4 decoder
Conflicts:
doc/general.texi
libavcodec/v410dec.c
libavcodec/version.h
libavformat/mpegtsenc.c
libavformat/smjpeg.c
libavformat/version.h
tests/codec-regression.sh
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 4c73dbfaa1..b8adb922fb 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 53 -#define LIBAVFORMAT_VERSION_MINOR 28 +#define LIBAVFORMAT_VERSION_MINOR 29 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |