Merge branch 'main' into v2.17.x

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

diff --git a/src/lib/ffmpeg_film_encoder.cc b/src/lib/ffmpeg_film_encoder.cc
index 2d100f7bc2f8e6ae431cb4addfa13d1d74134d1c..a2d26fd661e6b81ac1fbcfba1e8c8ae1c386da9f 100644 (file)
--- a/src/lib/ffmpeg_film_encoder.cc
+++ b/src/lib/ffmpeg_film_encoder.cc
@@ -102,7 +102,7 @@ FFmpegFilmEncoder::stereo_map() const
                map.set(dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
                map.set(dcp::Channel::LS,     0, overall_gain);
                break;
-       case 6:
+       default:
                map.set(dcp::Channel::LEFT,   0, overall_gain);
                map.set(dcp::Channel::RIGHT,  1, overall_gain);
                map.set(dcp::Channel::CENTRE, 0, overall_gain * minus_3dB);
@@ -111,7 +111,6 @@ FFmpegFilmEncoder::stereo_map() const
                map.set(dcp::Channel::RS,     1, overall_gain);
                break;
        }
-       /* XXX: maybe we should do something better for >6 channel DCPs */
        return map;
 }