X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=de9c82d2c6f606167e5513af83f9a281f2b5c63a;hb=b6e54c2c9d89016df4e1efe98974d6d69c9cc22b;hp=63fc6a5cc06f80388cfde58d04f8d89797699ddd;hpb=4d986a4f08cf5f13be6d3756f303276163bfe4a2;p=dcpomatic.git

diff --git a/wscript b/wscript
index 63fc6a5cc..de9c82d2c 100644
--- a/wscript
+++ b/wscript
@@ -381,9 +381,7 @@ def configure(conf):
                             int main () { av_ebur128_get_true_peaks (0); }\n
                             """,
                    msg='Checking for EBUR128-patched FFmpeg',
-                   libpath=conf.env['LIBPATH_AVFORMAT'],
-                   lib='avfilter avutil swresample avcodec avformat',
-                   includes=conf.env['INCLUDES_AVFORMAT'],
+                   uselib='AVCODEC AVFILTER',
                    define_name='DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG',
                    mandatory=False)
 
@@ -397,9 +395,7 @@ def configure(conf):
                             """,
                    msg='Checking for AVSubtitleRect::pict',
                    cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
-                   libpath=conf.env['LIBPATH_AVCODEC'],
-                   lib='avcodec',
-                   includes=conf.env['INCLUDES_AVCODEC'],
+                   uselib='AVCODEC',
                    define_name='DCPOMATIC_HAVE_AVSUBTITLERECT_PICT',
                    mandatory=False)
 
@@ -413,9 +409,7 @@ def configure(conf):
                             """,
                    msg='Checking for AVComponentDescriptor::depth_minus1',
                    cxxflags='-Wno-unused-result -Wno-unused-value -Wdeprecated-declarations -Werror',
-                   libpath=conf.env['LIBPATH_AVUTIL'],
-                   lib='avutil',
-                   includes=conf.env['INCLUDES_AVUTIL'],
+                   uselib='AVUTIL',
                    define_name='DCPOMATIC_HAVE_AVCOMPONENTDESCRIPTOR_DEPTH_MINUS1',
                    mandatory=False)