From: Carl Hetherington <cth@carlh.net>
Date: Mon, 29 Feb 2016 01:01:04 +0000 (+0000)
Subject: Add workaround for 3D DCPs whose picture MXFs are labelled (within the MXF) as mono.
X-Git-Tag: v2.6.28~1
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=bd81f33a39c6d20e78fce0d5be3b2d487b6df344;hp=f3b35c291d36d4c74906d2716ac598ab442518ab;p=dcpomatic.git

Add workaround for 3D DCPs whose picture MXFs are labelled (within the MXF) as mono.
---

diff --git a/cscript b/cscript
index fd160fc29..e97cf8744 100644
--- a/cscript
+++ b/cscript
@@ -280,8 +280,8 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
-            ('libdcp', '6db8817'),
-            ('libsub', '9fee7a4'))
+            ('libdcp', '45841f3'),
+            ('libsub', 'e3a5761'))
 
 def configure_options(target):
     opt = ''
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index ae2f8ef9f..f58577c8c 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -49,7 +49,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
 	, _dcp_content (c)
 {
 	dcp::DCP dcp (c->directory ());
-	dcp.read ();
+	dcp.read (false, 0, true);
 	if (c->kdm ()) {
 		dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
 	}
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 324cef379..81cb98b98 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -51,7 +51,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 	, _kdm_valid (false)
 {
 	dcp::DCP dcp (content->directory ());
-	dcp.read ();
+	dcp.read (false, 0, true);
 
 	if (content->kdm ()) {
 		dcp.add (dcp::DecryptedKDM (content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));