[FFmpeg-cvslog] Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'
Michael Niedermayer
git at videolan.org
Sun Mar 23 03:54:38 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 03:46:16 2014 +0100| [acb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94] | committer: Michael Niedermayer
Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'
* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
changelog: switch libx265 and compand entries
Conflicts:
Changelog
Not many changes as libx265 and compand are placed correctly for us
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94
---
More information about the ffmpeg-cvslog
mailing list