diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_examiner.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index e369b46ff..3163f59c4 100644 --- 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 (); |