X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=2d7116c7af8e18ea0a4e06ffad1809301e3d138a;hb=c959e0ecd1ee85f056007c80008efe4fa5b41d5a;hp=fb300aa5182b8e66b8646346bb4bccfbcf066708;hpb=e3609d01179f6bfd6d890c3300db1142071c73f9;p=dcpomatic.git

diff --git a/wscript b/wscript
index fb300aa51..2d7116c7a 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.3.6'
+VERSION = '2.4.1devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -279,7 +279,7 @@ def configure(conf):
 
     # FFmpeg
     if conf.options.static_ffmpeg:
-        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'swresample', 'postproc']
+        names = ['avformat', 'avfilter', 'avcodec', 'avutil', 'swscale', 'postproc']
         for name in names:
             static = subprocess.Popen(shlex.split('pkg-config --static --libs lib%s' % name), stdout=subprocess.PIPE).communicate()[0]
             libs = []
@@ -307,7 +307,6 @@ def configure(conf):
         conf.check_cfg(package='libavcodec', args='--cflags --libs', uselib_store='AVCODEC', mandatory=True)
         conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True)
         conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True)
-        conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True)
         conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True)
 
     # Boost