diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-12-16 16:10:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-12-16 16:10:13 +0000 |
| commit | eb753aa4027cfd74cd38576e4686a6cc67bc5c6b (patch) | |
| tree | 4f518fcabceb6060fa38a864a797e3bf7bd70651 /src | |
| parent | 7e4d7d9e4f146576a63c6ab1be9bca5a79b507d9 (diff) | |
Fix for new bits in FFmpeg (#1033).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 77c7c9ecd..0e782c9db 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -517,10 +517,12 @@ FFmpegContent::add_properties (list<UserProperty>& p) const _("SMPTE 240M"), _("Film"), _("BT2020"), - _("SMPTE ST 428-1 (CIE 1931 XYZ)") + _("SMPTE ST 428-1 (CIE 1931 XYZ)"), + _("SMPTE ST 431-2 (2011)"), + _("SMPTE ST 432-1 D65 (2010)") }; - DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11); + DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 13); p.push_back (UserProperty (UserProperty::VIDEO, _("Colour primaries"), primaries[_color_primaries])); char const * transfers[] = { @@ -560,9 +562,10 @@ FFmpegContent::add_properties (list<UserProperty>& p) const _("YCOCG"), _("BT2020 non-constant luminance"), _("BT2020 constant luminance"), + _("SMPTE 2085, Y'D'zD'x"), }; - DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11); + DCPOMATIC_ASSERT (AVCOL_SPC_NB == 12); p.push_back (UserProperty (UserProperty::VIDEO, _("Colourspace"), spaces[_colorspace])); if (_bits_per_pixel) { |