Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic

diff --cc ChangeLog
index e3398702e38f85cfe8561207feddce04be294a0c,a0d6edfdf180b12b832ab62b0a23e7969f5b9e12..4c1fb3a313728d036f8aaf0775133f42994c6da6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-05-10  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix setup of the libswresample context to work with high channel counts.
 +
+ 2014-05-09  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.69.1 released.
+ 
  2014-05-09  Carl Hetherington  <cth@carlh.net>
  
        * Fix crash on using content with more than 12 audio channels.