summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-02-13 15:17:26 +0100
committerCarl Hetherington <cth@carlh.net>2023-02-13 15:17:26 +0100
commit8b86c990e526e55e273cc408377f13e64a27fb26 (patch)
tree43e87616b3469a0c66eec21acbe52108cf8fbc54 /src
parent16de10ded1501e59a95ca1efa6e6e8ab0c7283a4 (diff)
Interop CPLs don't have MainPictureStoredArea (#2452).v1.8.58
Diffstat (limited to 'src')
-rw-r--r--src/cpl.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cpl.cc b/src/cpl.cc
index d73def9f..e050c885 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -297,10 +297,12 @@ CPL::read_composition_metadata_asset (cxml::ConstNodePtr node)
_main_sound_sample_rate = raw_convert<int>(sr_bits[0]);
}
- _main_picture_stored_area = dcp::Size (
- node->node_child("MainPictureStoredArea")->number_child<int>("Width"),
- node->node_child("MainPictureStoredArea")->number_child<int>("Height")
- );
+ if (_standard == dcp::Standard::SMPTE) {
+ _main_picture_stored_area = dcp::Size (
+ node->node_child("MainPictureStoredArea")->number_child<int>("Width"),
+ node->node_child("MainPictureStoredArea")->number_child<int>("Height")
+ );
+ }
_main_picture_active_area = dcp::Size (
node->node_child("MainPictureActiveArea")->number_child<int>("Width"),