Check for patched version of FFmpeg before using extra functions (#773).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 6ca2665228ce2b20dab7c20b373307377bb62a13..9bee9b4973a75f8ccd920934586c4620ada62591 100644 (file)
--- a/cscript
+++ b/cscript
@@ -278,9 +278,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', '938d9af', ffmpeg_options),
-            ('libdcp', '689d563'),
-            ('libsub', '09dd7a3'))
+    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
+            ('libdcp', 'fb03c08'),
+            ('libsub', 'f368daf'))
 
 def configure_options(target):
     opt = ''
@@ -289,7 +289,7 @@ def configure_options(target):
     if target.platform == 'windows':
         opt += ' --target-windows'
     elif target.platform == 'linux':
-        opt += ' --static-dcpomatic --static-openjpeg --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
+        opt += ' --static-dcpomatic --static-wxwidgets --static-ffmpeg --static-dcp --static-sub --static-cxml'
         if target.distro == 'centos':
             opt += ' --static-xmlsec --static-ssh --disable-tests'
             if target.version == '6.5':