+2015-04-29 Carl Hetherington <cth@carlh.net>
+
+ * Various fixes to bad timeline drag behaviour when
+ snapping (from master).
+
+2015-04-29 c.hetherington <cth@carlh.net>
+
+ * Hand-apply 291179175729b62e17a9c322cd27ae134d1310d9,
+ 8d92cce7d2885afa13ee4cb6f546dbf43942124b and
+ c994839239e84a1f62865ed82fdc090900a66b03 from master;
+ stop flickering when dragging in the timeline on OS X.
+
+2015-04-22 c.hetherington <cth@carlh.net>
+
+ * Add P3 colour conversion preset.
+
+ * Hand-apply all changes relating to colour specification
+ as chromaticity.
+
+2015-04-20 Carl Hetherington <cth@carlh.net>
+
+ * Hand-apply 47770097cf6a5d7dbbdded8977da5f3de53dfd33;
+ single-file hashes.
+
+ * Hand-apply e1d0d24146592e311d46781a1961fe080f6357cf;
+ attempt to fix confusion with the JPEG2000 bandwidth
+ control when a user enters a value directly rather than
+ using the spin arrows.
+
+2015-04-16 Carl Hetherington <cth@carlh.net>
+
+ * Fix potential OS X crashes due to another incarnation
+ of the bizarre multi-thread stringstream bug.
+
+2015-04-15 c.hetherington <cth@carlh.net>
+
+ * Hand-apply 94998e12d117f3f1781dfb1318939debfbf34546 from master;
+ add option to restore the default configuration.
+
+2015-04-12 Carl Hetherington <cth@carlh.net>
+
+ * Hand-apply 69866d9ba972d21375081c313ac245535ac55be9 from master;
+ handle removed ratio if it occurs in old files.
+
+ * Hand-apply c0e0b90d987af2586323d4a67bd67330256da51d from master;
+ remove 1.37 ratio and set Academy to 1.375.
+
+ * Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
+ ellipsize filters strings if it is long.
+
+ * Hand-apply 24ae3a8f0a68529b50c34079e643caf6b9327523 from master;
+ use the number of mapped audio channels for the DCP name, not the
+ number of DCP channels (#479).
+
+2015-03-25 Carl Hetherington <cth@carlh.net>
+
+ * Remove scaler settings and just uses SWS_BICUBIC all round.
+
+ * Hand-apply ec3e6abf817b84d589f0782b01f5059dd3bf0953; only allow
+ even DCP audio channel counts between 2 and 16 inclusive.
+
+ * Hand-apply 3e3d3e46a74af7b3e6431033c7c80bd058c02cf6update;
+ full/play length in the timing panel when the DCP frame rate is
+ changed.
+
+2015-03-24 Carl Hetherington <cth@carlh.net>
+
+ * Hand-apply 31eafa8a121b8d341d198e4fe426ee843cc70167; add a note
+ to the timing panel to try to stop people changing the video frame
+ rate in the wrong circumstances.
+
+ * Hand-apply e30fd8d; resurrect JSON server code.
+
+ * Hand-apply 7ba9dcdbfe8f0d94ad9887843995c152c45dfe9e from master;
+ allow "deletion" of the audio part of a FFmpeg file from the
+ timeline; delete unmaps the audio (#316).
+
+2015-02-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.41 released.
+
+2015-02-10 c.hetherington <cth@carlh.net>
+
+ * Default to no colour conversion for
+ JPEG2000 and DCP content (#445).
+
+2015-02-06 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.40 released.
+
+2015-02-06 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.39 released.
+
+2015-01-31 Carl Hetherington <cth@carlh.net>
+
+ * Fix error when using audio delay.
+
+2015-01-30 Carl Hetherington <cth@carlh.net>
+
+ * Fix update of preview when video fade changes.
+
+ * Hopefully fix black borders round the preview in
+ some cases.
+
+2015-01-24 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.38 released.
+
+2015-01-23 Carl Hetherington <cth@carlh.net>
+
+ * Fix update checker.
+
+ * Scan a whole FFmpeg file if no duration is given
+ in its header.
+
+ * Fix flicker of SubRip subtitles in some cases.
+
+ * Version 2.0.37 released.
+
+2015-01-21 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.36 released.
+
+2015-01-21 Carl Hetherington <cth@carlh.net>
+
+ * Fix differentiation between MXF-wrapped subtitles
+ and video/audio content.
+
+2015-01-20 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.35 released.
+
+2015-01-20 c.hetherington <cth@carlh.net>
+
+ * More informative error when failing to decode
+ JPEG2000 files.
+
+2015-01-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.34 released.
+
+2015-01-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.33 released.
+
+2015-01-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.32 released.
+
+2015-01-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.31 released.
+
+2015-01-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.30 released.
+
+2015-01-11 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.29 released.
+
+2015-01-11 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.28 released.
+
+2015-01-07 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.27 released.
+
+2015-01-07 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.26 released.
+
+2015-01-04 Carl Hetherington <cth@carlh.net>
+
+ * Fix loading of SMPTE XML subtitles which
+ are not MXF-wrapped.
+
+2014-12-14 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.25 released.
+
+2014-12-11 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.24 released.
+
+2014-12-11 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.23 released.
+
+2014-12-11 Carl Hetherington <cth@carlh.net>
+
+ * Add a language property to subtitle content and use it
+ for the DCP subtitle's language specification.
+
+2014-11-24 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.22 released.
+
+2014-11-24 Carl Hetherington <cth@carlh.net>
+
+ * Allow import of J2K image sequences.
+
+2014-11-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.21 released.
+
+2014-11-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.20 released.
+
+2014-11-10 Carl Hetherington <cth@carlh.net>
+
+ * Guess initial scale from the size of video
+ content images, taking pixel aspect ratio into
+ account where possible.
+
+2014-11-07 c.hetherington <cth@carlh.net>
+
+ * Add a hint if there is 3D content in a proposed 2D DCP.
+
+2014-11-06 Carl Hetherington <cth@carlh.net>
+
+ * Basic support for emailing a report of
+ a problem (#43).
+
+2014-11-05 c.hetherington <cth@carlh.net>
+
+ * Add a few more hints.
+
+2014-10-30 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.19 released.
+
+2014-10-30 Carl Hetherington <cth@carlh.net>
+
+ * Fix mis-merge causing complete breakage
+ of the main window.
+
+2014-10-28 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.18 released.
+
+2014-10-26 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.17 released.
+
+2014-11-02 Carl Hetherington <cth@carlh.net>
+
+ * Be more tolerant of some FFmpeg audio decoding errors;
+ should fix #352.
+
+2014-10-26 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.16 released.
+
2014-10-24 Carl Hetherington <cth@carlh.net>
+ * Add a pause button for jobs.
+
+ * Experimental support for bypassing colourspace conversion (#266).
+
* Version 1.76.6 released.
2014-10-23 Carl Hetherington <cth@carlh.net>
* Fix mix-placement of content when using the "Down"
button to move it.
+2014-10-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.15 released.
+
2014-10-22 Carl Hetherington <cth@carlh.net>
* Version 1.76.3 released.
* Make server finding more reliable when
there are more than a few servers.
+2014-10-05 Carl Hetherington <cth@carlh.net>
+
+ * Use a more sensible default position and size for
+ .srt subs.
+
+2014-10-03 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.14 released.
+
+2014-10-01 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.13 released.
+
+2014-09-30 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.12 released.
+
+2014-09-30 Carl Hetherington <cth@carlh.net>
+
+ * Add basic video fade in/out.
+
+2014-09-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.11 released.
+
+2014-09-18 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.10 released.
+
2014-10-08 Carl Hetherington <cth@carlh.net>
* Version 1.74.2 released.
2014-09-12 Carl Hetherington <cth@carlh.net>
+ * Version 2.0.9 released.
+
+2014-09-12 Carl Hetherington <cth@carlh.net>
+
+ * Add "re-examine" option to content context menu (#339).
+
+2014-09-11 Carl Hetherington <cth@carlh.net>
+
+ * Restore encoding optimisations for still-image sources.
+
+ * Add option to re-make signing chain with specified organisation,
+ common names etc. (#354)
+
* Allow separate X and Y scale for subtitles (#337).
2014-09-10 Carl Hetherington <cth@carlh.net>
* Fix hidden advanced preferences button in some locales.
-2014-09-08 Carl Hetherington <cth@carlh.net>
+ * Version 2.0.8 released.
+
+2014-09-10 Carl Hetherington <cth@carlh.net>
+
+ * Fix loading of 1.x films.
+
+ * Fix crash on audio analysis in some cases.
+
+2014-09-09 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.7 released.
+
+2014-09-09 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.6 released.
+
+2014-09-09 Carl Hetherington <cth@carlh.net>
- * Version 1.73.4 released.
+ * Fix missing OS X dependencies.
+
+ * Use a different directory for DCP-o-matic 2
+ configuration (not the same as 1.x).
2014-09-08 Carl Hetherington <cth@carlh.net>
- * Fix failure to load Targa files.
+ * Version 2.0.5 released.
-2014-09-07 Carl Hetherington <cth@carlh.net>
+ * Fix hidden advanced preferences button in some locales.
- * Version 1.73.3 released.
+2014-09-08 Carl Hetherington <cth@carlh.net>
+
+ * Fix failure to load Targa files.
2014-09-07 Carl Hetherington <cth@carlh.net>
* Fix a few bad fuzzy translations from the preferences dialog.
-2014-09-03 Carl Hetherington <cth@carlh.net>
-
- * Version 1.73.2 released.
-
2014-09-03 Carl Hetherington <cth@carlh.net>
* Fix server certificate downloads on OS X (#376).
2014-08-29 Carl Hetherington <cth@carlh.net>
+ * Version 2.0.4 released.
+
+2014-08-24 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.3 released.
+
+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.
* Some improvements to the manual.
2014-08-26 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>
2014-07-10 Carl Hetherington <cth@carlh.net>
* Version 1.72.2 released.
+>>>>>>> origin/master
2014-07-10 Carl Hetherington <cth@carlh.net>