Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:25:36 +0000 (21:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:26:34 +0000 (21:26 +0100)
commitbe41f21a3d6deb2714debe42530a28a6f3ee68d5
treea728e38530e3867d82b2f22434bc1adb0ad703e3
parentb84cd22a6661d5d1b5fc3660d5ade528b4813aea
parentcd8f772d0678a90957f4dfd5ce51af9d22e3f212
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h