summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-12 18:35:49 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-12 18:35:49 +0100
commitaa8843ee88691dfafa32079d80b94fbdb936f7a0 (patch)
tree922322736e0d81eb6a874d658228c2e8166ae4c3 /src/lib
parentfed92cb518dcd7449ccae2f8b7fb5984b71fc594 (diff)
Fix ISDCF name test and add check to see if a mapped channel is included in the DCP.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/film.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3aed4d965..297193f83 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -641,6 +641,11 @@ Film::isdcf_name (bool if_created_now) const
int non_lfe = 0;
int lfe = 0;
for (list<dcp::Channel>::const_iterator i = mapped.begin(); i != mapped.end(); ++i) {
+ if (static_cast<int> (*i) >= audio_channels()) {
+ /* This channel is mapped but is not included in the DCP */
+ continue;
+ }
+
if ((*i) == dcp::LFE) {
++lfe;
} else {