[FFmpeg-cvslog] Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'

Michael Niedermayer git at videolan.org
Sat Aug 23 22:22:45 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 23 22:08:15 2014 +0200| [e3601ceeb87516ac141605a41193aa4d726a2cf8] | committer: Michael Niedermayer

Merge commit '5caf039ba2b4be067568a30146f29008d8db28d0'

* commit '5caf039ba2b4be067568a30146f29008d8db28d0':
  Prepare for 11_beta2 Release

Conflicts:
	RELEASE

Not merged as theres no FFmpeg 11_beta2

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

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





More information about the ffmpeg-cvslog mailing list