Skip to content
Snippets Groups Projects
Commit be41f21a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'cd8f772d' 


* commit 'cd8f772d':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b84cd22a cd8f772d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment