diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-07 14:20:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-09 01:00:12 +0000 |
| commit | 4eef3ac6e393bedba5b1e524fd422e92ba9b0be6 (patch) | |
| tree | 8b323574e415fd2b58ac600337cfdf35019a8b42 | |
| parent | 75b9c2c3ce996a72d3f9084b827561bac1bbfd96 (diff) | |
Don't fake-write encrypted video frames as the asset ID is somehow (?)
embedded in the HMAC (#1232).
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/writer.cc | 5 |
2 files changed, 9 insertions, 0 deletions
@@ -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. */ |