summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-09-09 15:37:18 +0100
committerCarl Hetherington <cth@carlh.net>2016-09-09 15:37:18 +0100
commit7e2e6429c44b517dfd118d39df138f71c2761e0c (patch)
tree9070da614e794b67c52b963701f2f41d5f36d87f
parent740a372e92b2a8165f9c0a0e2370a49cca20fff7 (diff)
parent80ce3f0bfcc13a403b22c888c28bcee10f125ece (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
-rw-r--r--cscript2
-rw-r--r--src/lib/config.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/cscript b/cscript
index 87cfcfe52..4e3939d76 100644
--- a/cscript
+++ b/cscript
@@ -233,7 +233,7 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
- ('libdcp', '04a3cc5'),
+ ('libdcp', '62da6ba'),
('libsub', '067c21c'))
def configure_options(target):
diff --git a/src/lib/config.cc b/src/lib/config.cc
index a009edda8..9222d8498 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -92,7 +92,7 @@ Config::set_defaults ()
_default_dcp_audio_channels = 6;
_default_j2k_bandwidth = 100000000;
_default_audio_delay = 0;
- _default_interop = false;
+ _default_interop = true;
_mail_server = "";
_mail_port = 25;
_mail_user = "";