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

Michael Niedermayer git at videolan.org
Sun May 11 18:09:54 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 17:31:57 2014 +0200| [a05f86ec101f2c3ee48758f03fca3125dbbf83b8] | committer: Michael Niedermayer

Merge commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168' into release/2.2

* commit '8e9e57ed0c7f40741da1ca83e52c851263e0c168':
  Update Changelog

Conflicts:
	Changelog

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

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





More information about the ffmpeg-cvslog mailing list