diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-07 02:02:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-07 02:30:27 +0100 |
| commit | 6a56f4e63423d616b2224f654c1794fac25d6cfb (patch) | |
| tree | ec0756ebd0ecbdee1932c95824101214367c96ee /ffmpeg.c | |
| parent | 12d8340f16eed211f153e859b749ad415c1ba384 (diff) | |
| parent | b348c852aa8312d361123df0fa20e16feff7c2f1 (diff) | |
| download | ffmpeg-6a56f4e63423d616b2224f654c1794fac25d6cfb.tar.gz | |
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 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions