From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 May 2014 12:36:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://main.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.0.48~551^2~212
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1b576d63f5b5babda35c3995dd375e39baa16947

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

1b576d63f5b5babda35c3995dd375e39baa16947
diff --cc ChangeLog
index e3398702e,a0d6edfdf..4c1fb3a31
--- a/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.