From ff12ccdde76c54d3b9e69799a63750db9edf0023 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Apr 2024 00:38:14 +0200 Subject: Revert "Tweak how lzma is linked." This reverts commit 604a5f9343eebfa0108a19bb6b8ec60bc81f4819. I don't know why I did this, and it breaks the mac-old (10.8) target as the lzma.5.dylib is not present on those machines. --- src/lib/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/wscript b/src/lib/wscript index 7dd3bfe35..87a1ca787 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -228,7 +228,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 """ -- cgit v1.2.3 From 4401895dfbb25834d4385621824e72ae19c8962c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 29 Apr 2024 22:34:51 +0200 Subject: Fix silent stereo mixdown exports when the project audio channel count is > 6. This became much more of a problem when we started defaulting to 8 channels in projects. --- src/lib/ffmpeg_encoder.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 60241b233..c1170f098 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -102,7 +102,7 @@ FFmpegEncoder::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 @@ FFmpegEncoder::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; } -- cgit v1.2.3