diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-07 05:02:13 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-07 05:30:27 +0400 |
commit | 6a56f4e63423d616b2224f654c1794fac25d6cfb (patch) | |
tree | ec0756ebd0ecbdee1932c95824101214367c96ee /libavformat | |
parent | 12d8340f16eed211f153e859b749ad415c1ba384 (diff) | |
parent | b348c852aa8312d361123df0fa20e16feff7c2f1 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flicvideo: fix invalid reads
vorbis: Avoid some out-of-bounds reads
vqf: add more known extensions
cabac: remove unused function renorm_cabac_decoder
h264: Only use symbols from the SVQ3 decoder under proper conditionals.
add bytestream2_tell() and bytestream2_seek() functions
parsers: initialize MpegEncContext.slice_context_count to 1
spdifenc: use special alignment for DTS-HD length_code
Conflicts:
libavcodec/flicvideo.c
libavcodec/h264.c
libavcodec/mpeg4video_parser.c
libavcodec/vorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/vqf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 778509b737..69da4fd527 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -265,5 +265,5 @@ AVInputFormat ff_vqf_demuxer = { .read_header = vqf_read_header, .read_packet = vqf_read_packet, .read_seek = vqf_read_seek, - .extensions = "vqf", + .extensions = "vqf,vql,vqe", }; |