Cherry pick cbbc75a40156be9e3ef777e0f060f23639025e60 from master to fix slow exports.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 035dee09efd685bf2673d59b3a3ab4386b733c25..66d010b6dcbdade6ad29a93387b5238d35bed307 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2018-05-14  Carl Hetherington  <cth@carlh.net>
+2018-05-18  Carl Hetherington  <cth@carlh.net>
+
+       * Fix slow exports from DCP content (#1285).
+
+2018-05-15  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.5 released.
+
+2018-05-08  Carl Hetherington  <cth@carlh.net>
+
+       * Look at subtitle colour and effect when deciding whether or not to
+       re-make video (should fix #1290).
+
+2018-05-07  Carl Hetherington  <cth@carlh.net>
 
        * Fix invalid timings in SMPTE subtitle files (causing failure to play subtitles)
        in some cases (#1293).