[FFmpeg-cvslog] Merge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10

Michael Niedermayer git at videolan.org
Tue Jun 3 02:17:26 CEST 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 02:14:02 2014 +0200| [7c520e5cd61a59ef2e243630ae407e274b8d84b9] | committer: Michael Niedermayer

Merge commit '71b8c8430cf3f7056849257324fc39b423075ba1' into release/0.10

* commit '71b8c8430cf3f7056849257324fc39b423075ba1':
  sgidec: fix buffer size check in expand_rle_row()
  adx: check that the offset is not negative
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
	libavcodec/mpegvideo.c

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

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





More information about the ffmpeg-cvslog mailing list