[FFmpeg-cvslog] Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
Michael Niedermayer
git at videolan.org
Mon Feb 24 21:02:04 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 24 20:40:52 2014 +0100| [a88cbdfb90e4046aae427b5e196d3822b192b046] | committer: Michael Niedermayer
Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
libx265: Update API usage
Conflicts:
libavcodec/libx265.c
See: d3736471948cd06851f6b3aef352ef285b7c6480
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a88cbdfb90e4046aae427b5e196d3822b192b046
---
More information about the ffmpeg-cvslog
mailing list