summaryrefslogtreecommitdiff
path: root/src/lib/dcp_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-27 20:28:18 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-27 20:28:18 +0100
commit65a73ce59aeb4b452f55a87c001acb3cf177e99f (patch)
tree3421211f5573f877e14d3b090e762abf49629fc0 /src/lib/dcp_decoder.cc
parentc0d2b454ea1e8c9b047907343c902d72101ef6dd (diff)
parent9ce33a007d305cec0ebb91dc4839d0d2a05837ab (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/dcp_decoder.cc')
-rw-r--r--src/lib/dcp_decoder.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 2e3ed374a..156fba101 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -73,7 +73,13 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
}
}
- DCPOMATIC_ASSERT (cpl);
+ if (!cpl) {
+ /* No CPL found; probably an old file that doesn't specify it;
+ just use the first one.
+ */
+ cpl = cpls().front ();
+ }
+
_reels = cpl->reels ();
_reel = _reels.begin ();