summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-03-10 16:10:08 +0100
committerCarl Hetherington <cth@carlh.net>2025-03-10 16:10:08 +0100
commit0bff98d1d03af990f048bc278e8e433fe432e658 (patch)
treeef5075902135dc98ffcc13ef299689dba8bca68e
parent0ed7443df8c5cc41873e03d69582f7e9f18dd91d (diff)
Fix assertion failure on seeing a SMPTE DCP with a PKL type other than application/mxfv1.10.14
I'm not sure how this can happen, but it's been reported.
-rw-r--r--src/dcp.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 0d67cd0c..795dfca7 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -248,7 +248,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
}
} else if (
*pkl_type == remove_parameters(J2KPictureAsset::static_pkl_type(standard)) ||
- *pkl_type == remove_parameters(MPEG2PictureAsset::static_pkl_type(standard)) ||
+ (standard == Standard::INTEROP && *pkl_type == remove_parameters(MPEG2PictureAsset::static_pkl_type(standard))) ||
*pkl_type == remove_parameters(SoundAsset::static_pkl_type(standard)) ||
*pkl_type == remove_parameters(AtmosAsset::static_pkl_type(standard)) ||
*pkl_type == remove_parameters(SMPTETextAsset::static_pkl_type(standard))