Fix assertion failure on opening content properties (#816).
authorCarl Hetherington <cth@carlh.net>
Sat, 12 Mar 2016 01:11:36 +0000 (01:11 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 12 Mar 2016 01:11:36 +0000 (01:11 +0000)
src/lib/ffmpeg_content.cc

index 789fd735fd42f46a24aed8488d13480389391545..8452d65ee5c043428dc9a6df6ed5c63398dc17c3 100644 (file)
@@ -456,10 +456,11 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("SMPTE 170M (BT601)"),
                _("SMPTE 240M"),
                _("Film"),
-               _("BT2020")
+               _("BT2020"),
+               _("SMPTE ST 428-1 (CIE 1931 XYZ)")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 10);
+       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 11);
        p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
 
        char const * transfers[] = {
@@ -478,10 +479,12 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("BT1361 extended colour gamut"),
                _("IEC61966-2-1 (sRGB or sYCC)"),
                _("BT2020 for a 10-bit system"),
-               _("BT2020 for a 12-bit system")
+               _("BT2020 for a 12-bit system"),
+               _("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
+               _("SMPTE ST 428-1")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_TRC_NB == 16);
+       DCPOMATIC_ASSERT (AVCOL_TRC_NB == 18);
        p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
 
        char const * spaces[] = {