summaryrefslogtreecommitdiff
path: root/src/dcp.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-02 23:39:01 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-02 23:39:01 +0100
commit8259e2771f85c33c531a83fe1a78668f158208da (patch)
tree5f1f83a1a269c7ef5a889ae5c2727d2360315896 /src/dcp.cc
parentf2f2a2afc393dcaee747b97173d71a622d05d910 (diff)
Hopefully-correct PKL and AssetMap when using Interop PNG subtitles.
Diffstat (limited to 'src/dcp.cc')
-rw-r--r--src/dcp.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dcp.cc b/src/dcp.cc
index 58d05651..fa8ffabf 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -162,7 +162,6 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx
break;
}
}
-
}
if (!pkl_path) {
@@ -261,6 +260,8 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx
}
} else if (pkl_type == FontAsset::static_pkl_type(*_standard)) {
other_assets.push_back (shared_ptr<FontAsset> (new FontAsset (i->first, path)));
+ } else if (pkl_type == "image/png") {
+ /* It's an Interop PNG subtitle; let it go */
} else {
throw DCPReadError (String::compose("Unknown asset type %1 in PKL", pkl_type));
}