Merge master.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 23ccae1902d6f8189f305fa33f221f08f27353ae..e100fd23e466e0c395a50fe5168e4ada053915d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,28 @@
 
        * Add subtitle view.
 
+2014-08-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.12 released.
+
+2014-08-23  Carl Hetherington  <cth@carlh.net>
+
+       * Revert previous use of AVFormatContext::start_time when
+       computing the length of video.  I think this is wrong, and
+       causes bits to be missed off the end of videos (and other
+       problems).
+
+2014-08-20  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.11 released.
+
+2014-08-19  Carl Hetherington  <cth@carlh.net>
+
+       * Attempt to fix random crashes on OS X (especially during encodes)
+       thought to be caused by multiple threads using (different) stringstreams
+       at the same time; see src/lib/safe_stringstream.
+>>>>>>> origin/master
+
 2014-08-09  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.10 released.