Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

[ffmpeg] / configure

diff --git a/configure b/configure
index 1752a35c4ee067aec5a9066e83d53e2ac4290233..d4d7ae03b385525df2d0eb14a2c0eae79c505300 100755 (executable)
--- a/configure
+++ b/configure
@@ -1730,7 +1730,9 @@ MATH_FUNCS="
     atan2f
     cbrt
     cbrtf
+    copysign
     cosf
+    erf
     exp2
     exp2f
     expf
@@ -2718,6 +2720,7 @@ cropdetect_filter_deps="gpl"
 delogo_filter_deps="gpl"
 deshake_filter_select="pixelutils"
 drawtext_filter_deps="libfreetype"
+dynaudnorm_filter_deps="copysign erf"
 ebur128_filter_deps="gpl"
 eq_filter_deps="gpl"
 fftfilt_filter_deps="avcodec"
@@ -4298,6 +4301,8 @@ case $target_os in
         else
             target_os=mingw32
         fi
+        decklink_outdev_extralibs="$decklink_outdev_extralibs -lole32 -loleaut32"
+        decklink_indev_extralibs="$decklink_indev_extralibs -lole32 -loleaut32"
         LIBTARGET=i386
         if enabled x86_64; then
             LIBTARGET="i386:x86-64"
@@ -5128,6 +5133,7 @@ check_lib math.h sin -lm && LIBM="-lm"
 disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd
 
 atan2f_args=2
+copysign_args=2
 ldexpf_args=2
 powf_args=2