Merge.

diff --git a/ChangeLog b/ChangeLog
index 76f4adaa04f3952896291c31743526515c726d1c..34fe178a42763cb8a66206e09b1d0bb947ebb8c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-07  Carl Hetherington  <cth@carlh.net>
+
+       * Fix XML subtitle output in some cases.
+
 2016-10-06  c.hetherington  <cth@carlh.net>
 
        * Allow selection of CPL in multi-CPL DCPs (#733).

diff --git a/cscript b/cscript
index 768eb3e64c23ecbadd0aef9b547d282b379bcbd3..6e41ff7843c74b05d24135446c812f85897e411e 100644 (file)
--- a/cscript
+++ b/cscript
@@ -233,7 +233,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
-            ('libdcp', '4e1c04f'),
+            ('libdcp', 'c4d06c3'),
             ('libsub', '3db5052'))
 
 def configure_options(target):