Fix two crashes with Debian-shipped FFmpeg.
authorCarl Hetherington <cth@carlh.net>
Sun, 22 May 2016 23:53:14 +0000 (00:53 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 22 May 2016 23:53:14 +0000 (00:53 +0100)
src/lib/ffmpeg_content.cc

index 9a3348301382e88aa0b36e2dd8ef9dabcccaf1e7..7a1585ca21ba1bad370c525661c487f5b5966583 100644 (file)
@@ -478,7 +478,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("SMPTE ST 428-1 (CIE 1931 XYZ)")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_PRI_NB == 11);
+       DCPOMATIC_ASSERT (AVCOL_PRI_NB <= 11);
        p.push_back (UserProperty (_("Video"), _("Colour primaries"), primaries[_color_primaries]));
 
        char const * transfers[] = {
@@ -502,7 +502,7 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
                _("SMPTE ST 428-1")
        };
 
-       DCPOMATIC_ASSERT (AVCOL_TRC_NB == 18);
+       DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
        p.push_back (UserProperty (_("Video"), _("Colour transfer characteristic"), transfers[_color_trc]));
 
        char const * spaces[] = {