diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-13 23:35:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-13 23:35:10 +0100 |
| commit | debf1b47de684d33789dc1cbd5b4df5def550815 (patch) | |
| tree | 7f6118f43c310aea968c40383b117321cb17a004 /src | |
| parent | adaaf31a3dba6f3073cacdb64b60bcc6f8d1bfdf (diff) | |
Update to match new FFmpeg; fixes #1296.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 06ed5a801..26d3b88da 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -519,10 +519,20 @@ FFmpegContent::add_properties (list<UserProperty>& p) const _("BT2020"), _("SMPTE ST 428-1 (CIE 1931 XYZ)"), _("SMPTE ST 431-2 (2011)"), - _("SMPTE ST 432-1 D65 (2010)") + _("SMPTE ST 432-1 D65 (2010)"), // 12 + "", // 13 + "", // 14 + "", // 15 + "", // 16 + "", // 17 + "", // 18 + "", // 19 + "", // 20 + "", // 21 + _("JEDEC P22") }; - DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 13); + DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 23); p.push_back (UserProperty (UserProperty::VIDEO, _("Colour primaries"), primaries[_color_primaries])); char const * transfers[] = { @@ -563,9 +573,12 @@ FFmpegContent::add_properties (list<UserProperty>& p) const _("BT2020 non-constant luminance"), _("BT2020 constant luminance"), _("SMPTE 2085, Y'D'zD'x"), + _("Chroma-derived non-constant luminance"), + _("Chroma-derived constant luminance"), + _("BT2100") }; - DCPOMATIC_ASSERT (AVCOL_SPC_NB == 12); + DCPOMATIC_ASSERT (AVCOL_SPC_NB == 15); p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace])); if (_bits_per_pixel) { |