From d1108717fd7ba97a0d699331bddbef98bddfc53c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 Sep 2016 00:16:46 +0100 Subject: Write a 7.1 channel assignment into SMPTE DCP audio MXFs. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cscript') diff --git a/cscript b/cscript index 87cfcfe52..566381904 100644 --- a/cscript +++ b/cscript @@ -233,7 +233,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', '04a3cc5'), + ('libdcp', 'fe83eb5'), ('libsub', '067c21c')) def configure_options(target): -- cgit v1.2.3 From 80ce3f0bfcc13a403b22c888c28bcee10f125ece Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 Sep 2016 01:03:28 +0100 Subject: Change previous to use WTF for SMPTE DCP audio. --- cscript | 2 +- src/lib/reel_writer.cc | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 566381904..4e3939d76 100644 --- a/cscript +++ b/cscript @@ -233,7 +233,7 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options), - ('libdcp', 'fe83eb5'), + ('libdcp', '62da6ba'), ('libsub', '067c21c')) def configure_options(target): diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 1f9885e64..d742818ae 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -119,11 +119,7 @@ ReelWriter::ReelWriter ( */ _sound_asset_writer = _sound_asset->start_write ( _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary), - _film->interop() ? dcp::INTEROP : dcp::SMPTE, - /* XXX: this could well be wrong, but it's better than nothing; the whole channel assignment - thing needs fixing. - */ - dcp::CHANNEL_ASSIGNMENT_71 + _film->interop() ? dcp::INTEROP : dcp::SMPTE ); } } -- cgit v1.2.3