[FFmpeg-cvslog] Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4

Michael Niedermayer git at videolan.org
Sun Jan 18 04:05:28 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 03:56:09 2015 +0100| [fa1ca88cb6fcd36b39599c4f2608a774909c1645] | committer: Michael Niedermayer

Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4

* commit '4039f11ed82d84009b5146f0a563f33ced33e4db':
  Prepare for 11.2 Release

Conflicts:
	RELEASE

Merge for metadata only as this is not correct for 2.4.*

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

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





More information about the ffmpeg-cvslog mailing list