summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-09-09 01:03:28 +0100
committerCarl Hetherington <cth@carlh.net>2016-09-09 01:03:28 +0100
commit80ce3f0bfcc13a403b22c888c28bcee10f125ece (patch)
tree1239de0eecbf2e29e46339fde06b9e3f93ad0984
parentd1108717fd7ba97a0d699331bddbef98bddfc53c (diff)
Change previous to use WTF for SMPTE DCP audio.
-rw-r--r--cscript2
-rw-r--r--src/lib/reel_writer.cc6
2 files changed, 2 insertions, 6 deletions
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
);
}
}