X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=5d0338bc2d4070abc45bf7397fbbc767d92f822e;hb=2e27d014c584ac5348feca9c2d21b036fba437c0;hp=0e5d600fad95a11987e13eca48ce087b2ffb83b2;hpb=35466aa2bf59544d436a5f576e81856c5e0d0311;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index 0e5d600fa..5d0338bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2015-04-12  Carl Hetherington  <cth@carlh.net>
+
+	* 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