[FFmpeg-cvslog] Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1

Michael Niedermayer git at videolan.org
Mon Apr 21 14:32:02 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 14:19:35 2014 +0200| [1fabe4ae8cc07d80c735bb45858f542bb0aea944] | committer: Michael Niedermayer

Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1

* commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f':
  Update Changelog for 9.12

Conflicts:
	Changelog

Not merged, as the changelog does not apply to FFmpeg like this

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

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





More information about the ffmpeg-cvslog mailing list