Merge master.

diff --cc ChangeLog
index b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8,1a031b445a22c696969b4740989d91780e4237b9..662983a74a4598610f8752a66c8dc5d800c8c61c
--- 1/ChangeLog
--- 2/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 f6d747b9b49e6add9027c23360e9307818ffd386,301d44fa665f0840f60cdd30956352ec3f1d76b0..969397b0bdf9a1a43f696cfc9d4b22ac04e125ef
--- 1/src/lib/audio_mapping.cc
--- 2/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 src/lib/film.cc
Simple merge

diff --cc src/lib/resampler.cc
Simple merge

diff --cc src/lib/util.cc
Simple merge

diff --cc src/lib/util.h
Simple merge

diff --cc src/wx/audio_mapping_view.cc
Simple merge

diff --cc src/wx/film_editor.cc
Simple merge

diff --cc test/audio_mapping_test.cc
index f8467f3de9b144f70e2f620e1510eb2ee05191ab,bfb53b0871193c681c333497b3343403d5d1e761..fc597b91df10e4ca9dadaf8303a4b7cb844de983
--- 1/test/audio_mapping_test.cc
--- 2/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);
                }
        }
  

diff --cc test/silence_padding_test.cc
Simple merge