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

Michael Niedermayer git at videolan.org
Mon Jun 4 13:45:13 CEST 2012


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  4 13:40:13 2012 +0200| [514f3e7c02202902badb389904965ca278a0299e] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

* qatar/release/0.8:
  Update Changelog for the 0.8.3 Release
  Prepare for 0.8.3 Release
  ea: check chunk_size for validity.
  png: check bit depth for PAL8/Y400A pixel formats.
  qdm2: clip array indices returned by qdm2_get_vlc().
  tqi: Pass errors from the MB decoder
  h264: Add check for invalid chroma_format_idc
  h263dec: Disallow width/height changing with frame threads.

Conflicts:
	Changelog
	RELEASE
	libavcodec/eatqi.c
	libavcodec/h264_ps.c
	libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list