From bd81f33a39c6d20e78fce0d5be3b2d487b6df344 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 Feb 2016 01:01:04 +0000 Subject: [PATCH 1/1] Add workaround for 3D DCPs whose picture MXFs are labelled (within the MXF) as mono. --- cscript | 4 ++-- src/lib/dcp_decoder.cc | 2 +- src/lib/dcp_examiner.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 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 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 ())); -- 2.30.2