[FFmpeg-cvslog] Merge commit 'de187e3e9ec4803575deb1c293ccad84d2a88da8' into release/2.2

Michael Niedermayer git at videolan.org
Mon Mar 3 22:30:12 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 22:21:14 2014 +0100| [8ad2f45964ac9ac03cc48db1b4361101cb3106e3] | committer: Michael Niedermayer

Merge commit 'de187e3e9ec4803575deb1c293ccad84d2a88da8' into release/2.2

* commit 'de187e3e9ec4803575deb1c293ccad84d2a88da8':
  h264: Fix a typo from the previous commit
  h264: Lower bound check for slice offsets
  hevc: Always consider VLC NALU type mismatch fatal
  Prepare for 10_beta2 Release
  build: The MPEG-4 video parser depends on h263dsp

Conflicts:
	RELEASE
	configure

All changes are already in our 2.2 branch, this is just for metadata

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

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





More information about the ffmpeg-cvslog mailing list