summaryrefslogtreecommitdiff
path: root/src/lib/dcp_examiner.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-09-03 14:49:25 +0200
committerCarl Hetherington <cth@carlh.net>2022-09-03 17:12:34 +0200
commit0a5d3c77247d3e68a144bfc077c29fbcf3819735 (patch)
treeea2668d75f078d6fd290e038d5d5a9ed09c13bd9 /src/lib/dcp_examiner.h
parent34eb57979b5293ac3b864310f8fc8c77c26343e2 (diff)
Bump libdcp for better ContentKind support, and libsub
for fixes to \c tags in SSA files.
Diffstat (limited to 'src/lib/dcp_examiner.h')
-rw-r--r--src/lib/dcp_examiner.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index ac4380597..6b88a3c0d 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -131,7 +131,8 @@ public:
}
dcp::ContentKind content_kind () const {
- return _content_kind;
+ DCPOMATIC_ASSERT(_content_kind);
+ return *_content_kind;
}
std::string cpl () const {
@@ -194,7 +195,7 @@ private:
bool _kdm_valid = false;
boost::optional<dcp::Standard> _standard;
bool _three_d = false;
- dcp::ContentKind _content_kind;
+ boost::optional<dcp::ContentKind> _content_kind;
std::string _cpl;
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;