summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-13 23:37:14 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-13 23:37:14 +0100
commitb46a382f60fac33121f24b5cff51b0bd4f7eeaf2 (patch)
treeebf3318dd8d30526a44c4a24f75aea4c45374ee7
parente7cd5e4ee467386ff579a76c5f6a6fee03a78fc4 (diff)
Enable encryption of SMPTE subtitle assets.
-rw-r--r--cscript2
-rw-r--r--src/lib/reel_writer.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/cscript b/cscript
index 4e6436ffb..bb0848f76 100644
--- a/cscript
+++ b/cscript
@@ -237,7 +237,7 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
- ('libdcp', '11777d1'),
+ ('libdcp', '563dbf0'),
('libsub', '067c21c'))
def configure_options(target):
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index fa2813837..9d2f9d0bc 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -479,6 +479,9 @@ ReelWriter::write (PlayerSubtitles subs)
s->set_reel_number (1);
s->set_time_code_rate (_film->video_frame_rate ());
s->set_start_time (dcp::Time ());
+ if (_film->encrypted ()) {
+ s->set_key (_film->key ());
+ }
_subtitle_asset = s;
}
}