Fix merge.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index de9f099226614cc2eb623e33069e425c9479861d..2f35c94a7003ea5744586f5819bfe398f6881e6f 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.33devel'
+VERSION = '2.7.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -307,8 +307,9 @@ def configure(conf):
                             int main () { av_ebur128_get_true_peaks (0); }\n
                             """,
                    msg='Checking for patched FFmpeg',
-                   libpath='/usr/local/lib',
-                   lib=['avfilter'],
+                   libpath=conf.env['LIBPATH_AVFORMAT'],
+                   lib=['avfilter', 'avutil', 'swresample'],
+                   includes=conf.env['INCLUDES_AVFORMAT'],
                    uselib_store='PATCHED_FFMPEG',
                    define_name='DCPOMATIC_HAVE_PATCHED_FFMPEG',
                    mandatory=False)