From b37f62de134342373f15255f5b7e4eb100c99400 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 30 Nov 2015 11:52:17 +0000 Subject: Fix undefined mapping values in causing audio analyses to fail to load randomly. --- src/lib/audio_content.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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; } -- cgit v1.2.3