Hand-apply 97dde0e6d77b874742161703944d60524023664e from master.

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 46ccc9122..a528dd827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-12  Carl Hetherington  <cth@carlh.net>
+
+	* 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.