This check used to be for asset channel count mismatches, then it was

[dcpomatic.git] / src / lib / dcp_examiner.cc

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index e369b46ff08171be8ec699b2d03ee612d4b2e1b6..3163f59c41adc5f9cca25f5f06588015580b9b47 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -180,11 +180,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                                throw DCPError (_("Mismatched audio channel counts in DCP"));
                        }
 
-                       if (!_active_audio_channels) {
-                               _active_audio_channels = asset->active_channels();
-                       } else if (_active_audio_channels.get() != asset->active_channels()) {
-                               throw DCPError(_("Mismatched active audio channel counts in DCP"));
-                       }
+                       _active_audio_channels = std::max(_active_audio_channels.get_value_or(0), asset->active_channels());
 
                        if (!_audio_frame_rate) {
                                _audio_frame_rate = asset->sampling_rate ();