Reasonably confident that bb206658c308eb436f3ffc40cb13e2076bd1a249 does not have...

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b063002d9f1c3c3e372aea4736636d0b7018b810..46ccc91226b1acd65308a3da198e7f786562f975 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
+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).