diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 01:14:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 01:14:02 +0100 |
commit | 8acf9905a1c0f49325f31c757a681775e2c5d652 (patch) | |
tree | 62b68e90953f4fc05fd6552ad98f57c9ac1b7567 /libavcodec/h264dsp_template.c | |
parent | 1550c0885db601fadc1190b14cb40e870787e150 (diff) | |
parent | ba4b08b78918f399f9c9524750b26e904d146078 (diff) | |
download | ffmpeg-8acf9905a1c0f49325f31c757a681775e2c5d652.tar.gz |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
Note, all these commits where already in our release, this merge thus
changes nothing, its just for metadata
* qatar/release/0.7:
vp6: Fix illegal read.
vp6: Fix illegal read.
vp6: Reset the internal state when aborting key frames header parsing
vp6: Check for huffman tree build errors
vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
imgutils: Fix illegal read.
qdm2: check output buffer size before decoding
Fix out of bound reads in the QDM2 decoder.
Check for out of bound writes in the QDM2 decoder.
vmd: fix segfaults on corruped streams
Conflicts:
libavcodec/qdm2.c
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264dsp_template.c')
0 files changed, 0 insertions, 0 deletions