summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg_film_encoder.cc3
-rw-r--r--src/lib/wscript2
2 files changed, 2 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
"""