diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-16 10:34:07 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-16 10:34:07 +0000 |
| commit | b691a2b86733030a984f5bc9c99bdb7395e3bb01 (patch) | |
| tree | 0d79ae3aa8df9a392532bcc226f17deda8ee5de7 /src | |
| parent | 113ed92b6a998705746496f009191bf8d2d98871 (diff) | |
| parent | 7b3e6b43e25e11a2e75352ca4a2e7f963cbcc634 (diff) | |
Merge branch 'master' of git.carlh.net:git/libdcp
Diffstat (limited to 'src')
| -rw-r--r-- | src/dcp.cc | 3 | ||||
| -rw-r--r-- | src/parse/cpl.cc | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -260,10 +260,9 @@ DCP::read_assets () if (root == "CompositionPlaylist") { _files.cpls.push_back (t.string()); } else if (root == "PackingList") { + /* This is a hack; ignore second and subsequent PKLs */ if (_files.pkl.empty ()) { _files.pkl = t.string(); - } else { - boost::throw_exception (DCPReadError ("duplicate PKLs found")); } } } diff --git a/src/parse/cpl.cc b/src/parse/cpl.cc index efa4cac2..2a71134b 100644 --- a/src/parse/cpl.cc +++ b/src/parse/cpl.cc @@ -77,7 +77,7 @@ CPLAssetList::CPLAssetList (shared_ptr<const cxml::Node> node) main_subtitle = optional_type_child<MainSubtitle> (node, "MainSubtitle"); /* Ignore Atmos metadata */ - node->ignore_child ("axd:AuxData"); + node->ignore_child ("AuxData"); node->done (); } |
