diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/audio_content.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index fc295aa01..6d9c85ca2 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -168,6 +168,7 @@ AudioContent::audio_mapping () const } AudioMapping merged (channels, MAX_DCP_AUDIO_CHANNELS); + merged.make_zero (); int c = 0; int s = 0; @@ -175,7 +176,9 @@ AudioContent::audio_mapping () const AudioMapping mapping = i->mapping (); for (int j = 0; j < mapping.input_channels(); ++j) { for (int k = 0; k < MAX_DCP_AUDIO_CHANNELS; ++k) { - merged.set (c, k, mapping.get (j, k)); + if (k < mapping.output_channels()) { + merged.set (c, k, mapping.get (j, k)); + } } ++c; } |