summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-16 00:10:54 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-16 00:10:54 +0100
commit738395d47d8e776f1ea904fda96c2ecbdf58f400 (patch)
tree48e448b61a51c782b24cda86fefec1012e183122
parent33072c7f55a58c9f0b09f420f2bd3492aae66730 (diff)
Use CPL title for KDM AnnotationTexts.
-rw-r--r--ChangeLog4
-rw-r--r--cscript2
-rw-r--r--src/lib/film.cc2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d4dfba82c..d3d663ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-16 Carl Hetherington <cth@carlh.net>
+
+ * Use CPL title for KDM <AnnotationText> nodes.
+
2016-05-12 Carl Hetherington <cth@carlh.net>
* Version 2.8.2 released.
diff --git a/cscript b/cscript
index f14aef8d9..1408d2d3f 100644
--- a/cscript
+++ b/cscript
@@ -229,7 +229,7 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
- ('libdcp', 'beb6a30'),
+ ('libdcp', '92bec59'),
('libsub', 'v1.1.12'))
def configure_options(target):
diff --git a/src/lib/film.cc b/src/lib/film.cc
index adaa57346..dbcb9f31a 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1185,7 +1185,7 @@ Film::make_kdm (
}
return dcp::DecryptedKDM (
- cpl, key(), from, until, "DCP-o-matic", cpl->content_title_text(), dcp::LocalTime().as_string()
+ cpl, key(), from, until, cpl->content_title_text(), cpl->content_title_text(), dcp::LocalTime().as_string()
).encrypt (signer, recipient, trusted_devices, formulation);
}