Comments.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 44e8a25696b5170246e6888afdcfef8988dc64e8..196f5139b30d95853f559da34f4c4cde8d07a536 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2014-08-24  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.2 released.
+
+2014-08-06  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.1 released.
+
+2014-07-15  Carl Hetherington  <cth@carlh.net>
+
+       * A variety of changes were made on the 2.0 branch
+       but not documented in the ChangeLog.  Most sigificantly:
+
+       - DCP import
+       - Creation of DCPs with proper XML subtitles
+       - Import of .srt and .xml subtitles
+       - Audio processing framework (with some basic processors).
+
+2014-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * 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.
@@ -6,7 +39,8 @@
 
        * 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.h
+       at the same time; see src/lib/safe_stringstream.
+>>>>>>> origin/master
 
 2014-08-09  Carl Hetherington  <cth@carlh.net>
 
@@ -71,6 +105,7 @@
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.72.2 released.
+>>>>>>> origin/master
 
 2014-07-10  Carl Hetherington  <cth@carlh.net>