diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-19 00:56:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-19 00:56:14 +0100 |
| commit | c59a10bcf428154c7d1c9e3fad4469af36bb7d91 (patch) | |
| tree | 63c73a306f8779638da79c30822f80973d808353 /src/lib | |
| parent | 450b7465d99be7b53c95f168dbe757048b9bb363 (diff) | |
| parent | b7ebd9e9333439b5a1e04ee3d422ad2330ef1e58 (diff) | |
Merge tag 'v2.16.76' into v2.17.x
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_content.cc | 3 | ||||
| -rw-r--r-- | src/lib/dcp_decoder.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index d92c64ce0..4d1ab4f88 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -746,6 +746,9 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri } catch (dcp::ReadError &) { /* We couldn't read the DCP, so it's probably missing */ return false; + } catch (DCPError &) { + /* We couldn't read the DCP, so it's probably missing */ + return false; } catch (dcp::KDMDecryptionError &) { /* We have an incorrect KDM */ return false; diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index cf8521d48..303126caa 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -105,7 +105,6 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent if (old && old->lazy_digest() == _lazy_digest) { _reels = old->_reels; } else { - auto cpl_list = dcp::find_and_resolve_cpls(content->directories(), tolerant); if (cpl_list.empty()) { |