From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 May 2014 13:13:10 +0000 (+0100)
Subject: Merge master.
X-Git-Tag: v2.0.48~822
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=cfdd68eb5fb0ef8423e860103ad4e5510994f1da

Merge master.
---

cfdd68eb5fb0ef8423e860103ad4e5510994f1da
diff --cc ChangeLog
index b7e9ad74f,1a031b445..662983a74
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,21 +1,25 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +	* Add subtitle view.
 +
+ 2014-05-10  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Version 1.69.2 released.
+ 
+ 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.
+ 
+ 	* Re-introduce ffprobe call when adding content.
+ 
  2014-05-05  Carl Hetherington  <cth@carlh.net>
  
  	* Version 1.69.0 released.
diff --cc src/lib/audio_mapping.cc
index f6d747b9b,301d44fa6..969397b0b
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@@ -68,11 -69,11 +69,11 @@@ AudioMapping::make_default (
  
  	if (_content_channels == 1) {
  		/* Mono -> Centre */
 -		set (0, libdcp::CENTRE, 1);
 +		set (0, dcp::CENTRE, 1);
  	} else {
  		/* 1:1 mapping */
- 		for (int i = 0; i < _content_channels; ++i) {
+ 		for (int i = 0; i < min (_content_channels, MAX_DCP_AUDIO_CHANNELS); ++i) {
 -			set (i, static_cast<libdcp::Channel> (i), 1);
 +			set (i, static_cast<dcp::Channel> (i), 1);
  		}
  	}
  }
diff --cc test/audio_mapping_test.cc
index f8467f3de,bfb53b087..fc597b91d
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@@ -35,8 -34,8 +35,8 @@@ BOOST_AUTO_TEST_CASE (audio_mapping_tes
  	four.make_default ();
  
  	for (int i = 0; i < 4; ++i) {
- 		for (int j = 0; j < MAX_AUDIO_CHANNELS; ++j) {
+ 		for (int j = 0; j < MAX_DCP_AUDIO_CHANNELS; ++j) {
 -			BOOST_CHECK_EQUAL (four.get (i, static_cast<libdcp::Channel> (j)), i == j ? 1 : 0);
 +			BOOST_CHECK_EQUAL (four.get (i, static_cast<dcp::Channel> (j)), i == j ? 1 : 0);
  		}
  	}