From d7c281ed96aad47c6d62b2f5697d93dcf76d4faa Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 26 Sep 2016 12:41:08 +0100
Subject: Disallow refer if the film frame size is not the same as the DCP
 (#963).

---
 src/lib/dcp_content.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 96e9f17a2..1f844541c 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -444,6 +444,11 @@ DCPContent::can_reference (function<shared_ptr<ContentPart> (shared_ptr<const Co
 bool
 DCPContent::can_reference_video (list<string>& why_not) const
 {
+	if (film()->frame_size() != video->size()) {
+		why_not.push_back (_("The video frame size in the film differs from that in the DCP."));
+		return false;
+	}
+
 	return can_reference (bind (&Content::video, _1), _("There is other video content overlapping this DCP; remove it."), why_not);
 }
 
@@ -458,7 +463,7 @@ DCPContent::can_reference_audio (list<string>& why_not) const
                 }
         }
 
-        return can_reference (bind (&Content::audio, _1),   _("There is other audio content overlapping this DCP; remove it."), why_not);
+        return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not);
 }
 
 bool
-- 
cgit v1.2.3