diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-09-23 20:16:12 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-09-23 22:34:46 +0200 |
| commit | 5932cc8c99ff9704deab0eb309101ed00c4f570d (patch) | |
| tree | 7953a8c6d86fd8c8787da4b7e0d185e000e1d684 | |
| parent | 27e5d372e8ca10ad0c1fd189f9dc76eb14d7a3ca (diff) | |
Fix crash now that some audio channels are definitely unused.
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/audio_mapping.cc | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -375,8 +375,8 @@ def dependencies(target, options): (target.platform == 'osx' and target.bits == 64) or (target.platform == 'windows')) else {} - deps.append(('libdcp', 'e40f5c5', cpp_lib_options)) - deps.append(('libsub', '4bc0e7e', cpp_lib_options)) + deps.append(('libdcp', '38864bb', cpp_lib_options)) + deps.append(('libsub', '308476c', cpp_lib_options)) deps.append(('leqm-nrt', 'carl')) deps.append(('rtaudio', 'carl')) # We get our OpenSSL libraries from the environment, but we diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index 94efbe49b..40dc4ebfa 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -237,7 +237,7 @@ AudioMapping::mapped_output_channels () const list<int> mapped; for (vector<vector<float> >::const_iterator i = _gain.begin(); i != _gain.end(); ++i) { - for (size_t j = 0; j < i->size(); ++j) { + BOOST_FOREACH (dcp::Channel j, dcp::used_audio_channels()) { if (abs ((*i)[j]) > minus_96_db) { mapped.push_back (j); } |