diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/audio_mapping.cc | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,7 @@ 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-02 Carl Hetherington <cth@carlh.net> diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 28a0fc380..301d44fa6 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -28,6 +28,7 @@ using std::cout; using std::make_pair; using std::pair; using std::string; +using std::min; using boost::shared_ptr; using boost::lexical_cast; using boost::dynamic_pointer_cast; @@ -71,7 +72,7 @@ AudioMapping::make_default () set (0, libdcp::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); } } |