summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/lib/config.cc3
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 733625063..1d8f3fb42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-07-04 Carl Hetherington <cth@carlh.net>
+
+ * Try to initialise the number of threads to the number
+ of cores in the machine (#170).
+
+ * Pass _FILE_OFFSET_BITS=64 so that fopen() doesn't refuse
+ to open files of >2GB; fixes failure to re-start jobs
+ where the MXF has grown larger than 2GB on 32-bit machines.
+
2013-07-01 Carl Hetherington <cth@carlh.net>
* Version 0.106 released.
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 7d8e82335..d2d7fa2fd 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -36,13 +36,14 @@ using std::vector;
using std::ifstream;
using std::string;
using std::ofstream;
+using std::max;
using boost::shared_ptr;
Config* Config::_instance = 0;
/** Construct default configuration */
Config::Config ()
- : _num_local_encoding_threads (2)
+ : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency()))
, _server_port (6192)
, _reference_scaler (Scaler::from_id (N_("bicubic")))
, _tms_path (N_("."))