diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 9 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,7 @@ 2016-12-16 Carl Hetherington <cth@carlh.net> + * Fix crash on opening properties dialogue (#1033). + * Confirm overwrite of KDMs (#1008). * Add preference for default KDM target directory (#1013). 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) { |