Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 10:31:30 +0000 (11:31 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 10:33:47 +0000 (11:33 +0100)
commit30ac66abf0995c3a9a6c5370d357e51268b1b69f
treef8728337843780b890fcc99217c265ee902df70d
parent0b3decc5964bf1f51ef13af58606aea5878a6ce9
parent4b07ebf1eb13561492f7e3c30a67f34415016b3e
Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'

* commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e':
  mov: Update colr values

Mostly noop, see a3cab3d43387add8914c1c471fc99d733227d81b

Only the use of av_color_{primaries,transfer,space}_name() is merged.

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/mov.c