summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/cinema_sound_processor.h1
-rw-r--r--src/lib/ffmpeg_content.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/cinema_sound_processor.h b/src/lib/cinema_sound_processor.h
index 1d4a389f3..c2d2f44c0 100644
--- a/src/lib/cinema_sound_processor.h
+++ b/src/lib/cinema_sound_processor.h
@@ -38,6 +38,7 @@ class CinemaSoundProcessor : public boost::noncopyable
{
public:
CinemaSoundProcessor (std::string i, std::string n);
+ virtual ~CinemaSoundProcessor () {}
virtual float db_for_fader_change (float from, float to) const = 0;
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 9a3348301..7a1585ca2 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -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[] = {