[FFmpeg-cvslog] Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
Michael Niedermayer
git at videolan.org
Thu Feb 13 00:22:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 13 00:12:03 2014 +0100| [86316039ab06bcf5c8b9c14f535f1dd072990e3b] | committer: Michael Niedermayer
Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba'
* commit '50ea93158d4c480f64069e8bd1da388486dcf4ba':
Add libx265 encoder
Conflicts:
Changelog
LICENSE
configure
libavcodec/allcodecs.c
libavcodec/libx265.c
libavcodec/version.h
See: bb6b1731eba2fac424ff8ad3003fe58b308debd1
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86316039ab06bcf5c8b9c14f535f1dd072990e3b
---
More information about the ffmpeg-cvslog
mailing list