Merge commit '4a664224502b42e3b28949d905a8de7769892184'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:27:23 +0000 (11:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Sep 2015 09:27:23 +0000 (11:27 +0200)
* commit '4a664224502b42e3b28949d905a8de7769892184':
  pixfmt: Add new SMPTE color primaries and transfer characteristic values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge