[FFmpeg-cvslog] Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
Michael Niedermayer
git at videolan.org
Mon Nov 4 21:37:38 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 4 21:25:36 2013 +0100| [be41f21a3d6deb2714debe42530a28a6f3ee68d5] | committer: Michael Niedermayer
Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
lavc: Add colorimetry values for BT.2020, other non-included ones
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be41f21a3d6deb2714debe42530a28a6f3ee68d5
---
More information about the ffmpeg-cvslog
mailing list