From dd9f4f7e9511f8f830ec05d1b60c475c6b2d71e0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Apr 2018 15:13:42 +0100 Subject: Fix incorrect container size when loading a VF/OV combination into the player. --- src/lib/dcp_decoder.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/lib/dcp_decoder.cc') diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 0250fa9fe..5f06501b6 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -54,7 +54,9 @@ DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log, boo : DCP (c) , _decode_referenced (false) { - video.reset (new VideoDecoder (this, c, log)); + if (c->video) { + video.reset (new VideoDecoder (this, c, log)); + } if (c->audio) { audio.reset (new AudioDecoder (this, c->audio, log, fast)); } @@ -304,8 +306,12 @@ DCPDecoder::set_decode_referenced (bool r) { _decode_referenced = r; - video->set_ignore (_dcp_content->reference_video() && !_decode_referenced); - audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced); + if (video) { + video->set_ignore (_dcp_content->reference_video() && !_decode_referenced); + } + if (audio) { + audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced); + } } void -- cgit v1.2.3