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

diff --git a/cscript b/cscript
index fd160fc29b488dd16eb9b14c4d1117616ddd5fb6..e97cf8744243fc3837f905fd4810c069664e7425 100644 (file)
--- 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 ae2f8ef9fe19c2d7d0d5e2509de0240295bdff43..f58577c8c1388d9148e67b54a27e6dd2fbb1d4d9 100644 (file)
--- 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 324cef37968b4cc91ad59b49005ae65cdd67dc19..81cb98b986b4ad09236d31eb28f1b26bb34c45d9 100644 (file)
--- 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 ()));