diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-01 10:15:18 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-01 10:15:18 +0200 |
| commit | 622995bacbea495e570f52fa0094fb653c462ecd (patch) | |
| tree | acf34b2100ce17d579422abef9c84b556d402f1f /src | |
| parent | 9d6b7a426b71f1791fc3ad1ac15099892c6709fd (diff) | |
| parent | 191e92a4babdea589aa9c78fa659b0d8fc97ff82 (diff) | |
Merge branch 'main' into v2.17.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg_film_encoder.cc | 3 | ||||
| -rw-r--r-- | src/lib/wscript | 2 | ||||
| -rw-r--r-- | src/wx/supporters.cc | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_film_encoder.cc b/src/lib/ffmpeg_film_encoder.cc index 2d100f7bc..a2d26fd66 100644 --- 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; } diff --git a/src/lib/wscript b/src/lib/wscript index 86cf2e0b6..a4758c737 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -237,7 +237,7 @@ def build(bld): obj.uselib = """ AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 BOOST_REGEX - SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB XML++ + SAMPLERATE POSTPROC TIFF SSH DCP CXML GLIB LZMA XML++ CURL ZIP BZ2 FONTCONFIG PANGOMM CAIROMM XMLSEC SUB ICU NETTLE PNG JPEG LEQM_NRT LIBZ """ diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 514b53d7b..b39dbd5dc 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -102,6 +102,7 @@ supported_by.Add (wxT ("Kenneth Biswabic")); supported_by.Add (wxT ("Mike Blakesley")); supported_by.Add (wxT ("Cyrille Blanc")); supported_by.Add (wxT ("Stijn De Blieck")); +supported_by.Add (wxT ("Nathan Block")); supported_by.Add (wxT ("Félix Blume")); supported_by.Add (wxT ("Theodor Boder")); supported_by.Add (wxT ("Thorsten Boehnke")); @@ -318,6 +319,7 @@ supported_by.Add (wxT ("Guy Edmonds")); supported_by.Add (wxT ("Simon Edwards")); supported_by.Add (wxT ("Arthur Edwards")); supported_by.Add (wxT ("Si Edwards")); +supported_by.Add (wxT ("NEU-Deli Einbeck")); supported_by.Add (wxT ("Thomas Eingartner")); supported_by.Add (wxT ("Gabriel Eiriz")); supported_by.Add (wxT ("Chris Eller")); @@ -655,6 +657,7 @@ supported_by.Add (wxT ("Dieter Kovacic")); supported_by.Add (wxT ("Filip Kovcin")); supported_by.Add (wxT ("Alan Kraemer")); supported_by.Add (wxT ("Joel Krantz")); +supported_by.Add (wxT ("Oliver Krause")); supported_by.Add (wxT ("Ralph-Raimund Krause")); supported_by.Add (wxT ("Christian Kreil")); supported_by.Add (wxT ("Sebastian Kreis")); @@ -683,6 +686,7 @@ supported_by.Add (wxT ("Angela En-yu Lao")); supported_by.Add (wxT ("Daniel Martinez Lara")); supported_by.Add (wxT ("Gabriel Montagné Láscaris-Comneno")); supported_by.Add (wxT ("Marga Laube")); +supported_by.Add (wxT ("James Lauchlan")); supported_by.Add (wxT ("Nicholas Lavigne")); supported_by.Add (wxT ("Philip Lawrence")); supported_by.Add (wxT ("David Lawrence")); @@ -861,6 +865,7 @@ supported_by.Add (wxT ("Rigoberto Mora")); supported_by.Add (wxT ("Pierre-Jean Moreau")); supported_by.Add (wxT ("Stanislas Moreau")); supported_by.Add (wxT ("Ted Morée")); +supported_by.Add (wxT ("Daniel Morez")); supported_by.Add (wxT ("Paolo Morini")); supported_by.Add (wxT ("Lars Moritz")); supported_by.Add (wxT ("Lindsay Morris")); |