diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-21 22:33:43 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-22 00:06:21 +0200 |
| commit | e40f5c5923d72b42d7b1c617a6e459569d584e8c (patch) | |
| tree | 4b87b267ea7e4a16f7b49464fd79d1473944fbd9 /src/sound_asset.cc | |
| parent | b301ef78906ed61eced5d0a331b377b644ae647c (diff) | |
Fix crashes when static linking due to tricky lifetimecrash
management of ASDCP::DefaultSMPTEDict().
Diffstat (limited to 'src/sound_asset.cc')
| -rw-r--r-- | src/sound_asset.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 15626b9a..6752d9b1 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -57,6 +57,7 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using namespace dcp; + SoundAsset::SoundAsset (boost::filesystem::path file) : Asset (file) /* XXX: this is a fallback language, which will be used if we can't find the RFC5646SpokenLanguage @@ -89,7 +90,7 @@ SoundAsset::SoundAsset (boost::filesystem::path file) ASDCP::MXF::SoundfieldGroupLabelSubDescriptor* soundfield; ASDCP::Result_t rr = reader.OP1aHeader().GetMDObjectByType( - ASDCP::DefaultSMPTEDict().ul(ASDCP::MDD_SoundfieldGroupLabelSubDescriptor), + asdcp_smpte_dict->ul(ASDCP::MDD_SoundfieldGroupLabelSubDescriptor), reinterpret_cast<ASDCP::MXF::InterchangeObject**>(&soundfield) ); |