* Add subtitle view.
+2014-06-03 Carl Hetherington <cth@carlh.net>
+
+ * Fix bad resampling of separate sound file sources that
+ have specified video frame rates.
+
+ * Version 1.69.20 released.
+
+2014-06-03 Carl Hetherington <cth@carlh.net>
+
+ * Re-calculate and update audio plots when the mapping is changed.
+
+ * Change the -3dB preset to -6dB since we are talking about
+ amplitude, not power.
+
+ * Version 1.69.19 released.
+
+2014-06-02 Carl Hetherington <cth@carlh.net>
+
+ * Empirical hack to prevent over-read of array
+ by libswscale; may fix crashes at the start of
+ DCP encodes.
+
+2014-05-29 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.18 released.
+
+2014-05-28 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.17 released.
+
+2014-05-28 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.16 released.
+
+2014-05-28 Carl Hetherington <cth@carlh.net>
+
+ * Rework KDM generation to be about CPLs rather than DCPs,
+ and allow specification of any CPL to generate KDMs for.
+
+ Requested-by: Richard Turner
+
+2014-05-27 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.15 released.
+
+2014-05-26 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.14 released.
+
+2014-05-26 Carl Hetherington <cth@carlh.net>
+
+ * Fix problems with non-zero FFmpeg content start times.
+
+2014-05-24 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.13 released.
+
+2014-05-24 Carl Hetherington <cth@carlh.net>
+
+ * Fix problems with log setup from config.
+
+2014-05-23 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.12 released.
+
+2014-05-22 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.11 released.
+
+2014-05-21 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.10 released.
+
+2014-05-21 Carl Hetherington <cth@carlh.net>
+
+ * Tidy up logging a bit and make it configurable from the GUI
+ (moving a few things into an Advanced preferences tab at
+ the same time).
+
+2014-05-19 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.9 released.
+
+2014-05-19 Carl Hetherington <cth@carlh.net>
+
+ * Decode image sources in the multi-threaded part
+ of the transcoder, rather than the single-threaded.
+
+2014-05-16 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.8 released.
+
+2014-05-16 Carl Hetherington <cth@carlh.net>
+
+ * Fix various confusions in translations of abbreviated
+ channel names (Lc, Rc etc.)
+
+2014-05-14 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.7 released.
+
+2014-05-14 Carl Hetherington <cth@carlh.net>
+
+ * Bump libdcp to remove checks on PCM MXF edit rates,
+ so we can generate strange ones in DCP-o-matic.
+
+2014-05-13 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.6 released.
+
+2014-05-13 Carl Hetherington <cth@carlh.net>
+
+ * Remove artificial 100fps limit when using
+ "any" DCP frame rate.
+
+2014-05-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.5 released.
+
+2014-05-12 Carl Hetherington <cth@carlh.net>
+
+ * Add option to use any DCP frame rate, rather than just
+ the "allowed" set.
+
+ * Version 1.69.4 released.
+
+2014-05-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.3 released.
+
+2014-05-12 Carl Hetherington <cth@carlh.net>
+
+ * Use libdcp::raw_convert instead of boost::lexical_cast and
+ LocaleGuard, hopefully to fix large numbers being written with
+ thousands separators on some locales.
+
+2014-05-10 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.2 released.
+
+2014-05-10 Carl Hetherington <cth@carlh.net>
+
+ * Fix setup of the libswresample context to work with high channel counts.
+
+2014-05-09 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.1 released.
+
+2014-05-09 Carl Hetherington <cth@carlh.net>
+
+ * Fix crash on using content with more than 12 audio channels.
+
+ * Re-introduce ffprobe call when adding content.
+
+2014-05-05 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.0 released.
+
+2014-05-02 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.68.0 released.
+
+2014-04-29 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.67.1 released.
+
+2014-04-29 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.67.0 released.
+
+2014-04-27 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.16 released.
+
+2014-04-27 Carl Hetherington <cth@carlh.net>
+
+ * Add .dpx to the list of acceptable image files.
+
+ * Slightly better handling of uncaught exceptions.
+
+ * Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as
+ it appears that the same bug remains.
+
+2014-04-25 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.15 released.
+
+2014-04-25 Carl Hetherington <cth@carlh.net>
+
+ * Fix subtitle display when the next subtitle is decoded before the previous
+ one has finished.
+
+2014-04-24 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.14 released.
+
+2014-04-23 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.13 released.
+
+2014-04-21 Carl Hetherington <cth@carlh.net>
+
+ * Update to es_ES translation from Manuel AC.
+
+ * Update to fr_FR translation from Thierry Journet.
+
+2014-04-17 Carl Hetherington <cth@carlh.net>
+
+ * Fix update of the gain control when using the gain calculator
+ dialog.
+
+ * Version 1.66.12 released.
+
+2014-04-07 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.11 released.
+
+2014-04-07 Carl Hetherington <cth@carlh.net>
+
+ * Updated fr_FR translation from Thierry Journet.
+
+2014-04-02 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.66.10 released.
+
2014-04-01 Carl Hetherington <cth@carlh.net>
* Basic support for separate left/right-eye files or directories
* Another attempt to fix colour conversion dialog strange behaviour
on OS X.
->>>>>>> master
2014-03-18 Carl Hetherington <cth@carlh.net>