X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=ChangeLog;h=66c0a64e1685dc71a28d6fd14f2c7b8bfbcc61e1;hb=c9244dd9978a462cf9ddaf6691edd98312a790cd;hp=b063002d9f1c3c3e372aea4736636d0b7018b810;hpb=86aaba4f392c35ccf28221049f87b8cdba868777;p=dcpomatic.git

diff --git a/ChangeLog b/ChangeLog
index b063002d9..66c0a64e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
+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).