summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/writer.cc5
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f76391f6a..1362a47c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-07 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad DCPs when re-making in encrypted projects (#1232).
+
2018-03-05 Carl Hetherington <cth@carlh.net>
* Version 2.11.70 released.
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 10e4514fb..deb93b6c1 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -634,6 +634,11 @@ Writer::write_cover_sheet ()
bool
Writer::can_fake_write (Frame frame) const
{
+ if (_film->encrypted()) {
+ /* We need to re-write the frame because the asset ID is embedded in the HMAC... I think... */
+ return false;
+ }
+
/* We have to do a proper write of the first frame so that we can set up the JPEG2000
parameters in the asset writer.
*/