[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

Michael Niedermayer git at videolan.org
Thu Dec 8 01:17:41 CET 2011


ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  8 01:14:02 2011 +0100| [8acf9905a1c0f49325f31c757a681775e2c5d652] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8acf9905a1c0f49325f31c757a681775e2c5d652
---





More information about the ffmpeg-cvslog mailing list