From aa8843ee88691dfafa32079d80b94fbdb936f7a0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 12 Apr 2015 18:35:49 +0100
Subject: Fix ISDCF name test and add check to see if a mapped channel is
 included in the DCP.

---
 src/lib/film.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lib')

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 {
-- 
cgit v1.2.3