Fix recognition of patched FFmpeg library on some platforms.
authorCarl Hetherington <cth@carlh.net>
Mon, 7 Mar 2016 01:00:45 +0000 (01:00 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 7 Mar 2016 01:01:37 +0000 (01:01 +0000)
wscript

diff --git a/wscript b/wscript
index de9f099226614cc2eb623e33069e425c9479861d..b7e8068e196bbff1a21f6c5fd6c6522ef6f26c6a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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)