diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-21 22:43:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-21 22:43:44 +0000 |
| commit | 89f81959786719cf63eb0126869a79d5fe2880f4 (patch) | |
| tree | 1d929a934743a7e1dc2b297d6f87d3a18d418ccf | |
| parent | 543ed8094af406e5d8179ab95634a67e1ebb68f1 (diff) | |
Bump libdcp; pulls in KDM tweaks but also atmos fix.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -283,8 +283,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '5fce90f', ffmpeg_options), - ('libdcp', 'a18b9d2'), - ('libsub', 'ad08b7b'), + ('libdcp', '5ec38e1'), + ('libsub', '0ad03c6'), ('rtaudio-cdist', None)) def configure_options(target): diff --git a/src/lib/film.cc b/src/lib/film.cc index d5af889c5..2b3e0d38b 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1264,7 +1264,7 @@ Film::make_kdm ( return dcp::DecryptedKDM ( cpl->id(), keys, from, until, cpl->content_title_text(), cpl->content_title_text(), dcp::LocalTime().as_string() - ).encrypt (signer, recipient, trusted_devices, formulation); + ).encrypt (signer, recipient, trusted_devices, formulation, true, 0); } /** @param screens Screens to make KDMs for. diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 866d09c70..bc08a13d2 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -328,7 +328,7 @@ private: } /* Encrypt */ - screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation()))); + screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation(), true, 0))); } pair<shared_ptr<Job>, int> result = _output->make ( diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 3287fc651..364835f07 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -305,7 +305,7 @@ kdm_from_dkdm ( kdm.add_key(j); } - return kdm.encrypt (signer, target, trusted_devices, formulation); + return kdm.encrypt (signer, target, trusted_devices, formulation, true, 0); } void |