summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-18 15:16:55 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-18 15:16:55 +0000
commitd7b7efa3d6ed53e8a99d9b26d50662c559d1d764 (patch)
tree9a849fc8a6dc182650dc1dbe04c1e03f2df31a10
parent846c5eac9e495f7b90431b34263227e7ebce06de (diff)
Stop double-calculation of hashes.
-rw-r--r--ChangeLog2
-rw-r--r--src/lib/writer.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 53dbdb8fd..7aa8facf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2015-12-18 c.hetherington <cth@carlh.net>
+ * Fix double-calculation of DCP hashes.
+
* Add hint about making non-24/48 FPS Interop DCPs.
2015-12-15 Carl Hetherington <cth@carlh.net>
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 675f210e9..93f5ed6d6 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -473,11 +473,11 @@ Writer::finish ()
BOOST_FOREACH (ReelWriter& i, _reels) {
- cpl->add (i.create_reel (_reel_assets, _fonts));
-
shared_ptr<Job> job = _job.lock ();
DCPOMATIC_ASSERT (job);
i.calculate_digests (job);
+
+ cpl->add (i.create_reel (_reel_assets, _fonts));
}
dcp::XMLMetadata meta;