summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-03-07 01:00:45 +0000
committerCarl Hetherington <cth@carlh.net>2016-03-07 01:01:37 +0000
commit55ac039531dd1724af11ca61395c02db7a4c3524 (patch)
tree6bba10e7b1cc9ae64404c5fd7e8ae6637670eb34
parent046b44a0ba0e43f756b52968da7d2a55dacbd988 (diff)
Fix recognition of patched FFmpeg library on some platforms.
-rw-r--r--wscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/wscript b/wscript
index de9f09922..b7e8068e1 100644
--- 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)