[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/9' into release/1.1

Michael Niedermayer git at videolan.org
Mon Sep 9 09:31:16 CEST 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  9 08:44:14 2013 +0200| [bf312714786a4018e9bf1c7f4c5444d906ae0a37] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  Update Changelog
  Prepare for 9.9 RELEASE
  lavf: fix the comparison in an overflow check
  dv: Add a guard to not overread the ppcm array
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
	Changelog
	RELEASE
	libavformat/utils.c

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

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





More information about the ffmpeg-cvslog mailing list