Michael Niedermayer be41f21a3d 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@gmx.at>

2013-11-04 21:26:34 +01:00

66 KiB

Raw Blame History

View Raw