Applied a patch from master, so update TO_PORT.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 46ccc91226b1acd65308a3da198e7f786562f975..ba9012f0fd59756cf0def5437af6cfe7735e2b98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-04-12  Carl Hetherington  <cth@carlh.net>
+
+       * 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.