summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-09 22:55:43 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-09 22:55:43 +0100
commit283770d0bdde7ba4d1f7bc4b1a7d1812bff5c835 (patch)
treed44dfeecbe3abfae98289be5ff7dade95af78ad6 /src
parent9579bfdec2fab28fc221e397cf848a08e48f6840 (diff)
Fix crash on using content with more than 12 audio channels.
Reported-by: Sumit
Diffstat (limited to 'src')
-rw-r--r--src/lib/audio_mapping.cc3
1 files changed, 2 insertions, 1 deletions
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);
}
}