Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

4 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index eae22c2a3..b8908c804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
 2016-10-24  Carl Hetherington  <cth@carlh.net>
 
-	* Fix various problems with 3D alternate-frame
+	* Version 2.9.38 released.
+
+2016-10-24  Carl Hetherington  <cth@carlh.net>
+
+	* Fix more problems with 3D alternate-frame
 	sources.
 
+	* Allow creation of >60fps 3D DCPs.
+
+	* Fix over-fussy parsing of times from subtitles
+	files in some cases.
+
+	* Fix repeated subtitles in some cases.
+
 2016-10-19  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.9.37 released.
@@ -10,7 +21,7 @@
 2016-10-19  Carl Hetherington  <cth@carlh.net>
 
 	* Fix various problems with 3D DCP creation
-	from 3D DCP and 3D-alernate-frame sources.
+	from 3D DCP and 3D-alternate-frame sources.
 
 2016-10-18  Carl Hetherington  <cth@carlh.net>
 
diff --git a/debian/changelog b/debian/changelog
index 33ce629ca..96b2dfc55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.9.37-1) UNRELEASED; urgency=low
+dcpomatic (2.9.38-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -475,8 +475,9 @@ dcpomatic (2.9.37-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 19 Oct 2016 23:41:17 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 24 Oct 2016 22:26:27 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index bb65c1f2b..c0dbf0562 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -39,6 +39,7 @@
 #include <fstream>
 #include <cerrno>
 #include <iostream>
+#include <cfloat>
 
 #include "i18n.h"
 
@@ -632,7 +633,7 @@ Writer::set_digest_progress (Job* job, float progress)
 	_digest_progresses[boost::this_thread::get_id()] = progress;
 
 	boost::mutex::scoped_lock lm (_digest_progresses_mutex);
-	float min_progress = 0;
+	float min_progress = FLT_MAX;
 	for (map<boost::thread::id, float>::const_iterator i = _digest_progresses.begin(); i != _digest_progresses.end(); ++i) {
 		min_progress = min (min_progress, i->second);
 	}
diff --git a/wscript b/wscript
index 145535343..6c1fdfc5f 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.9.37devel'
+VERSION = '2.9.38devel'
 
 def options(opt):
     opt.load('compiler_cxx')