diff mbox series

[FFmpeg-devel] avfilter/frei0r: use win32dlfcn wrapper

Message ID 20210905145510.5099-1-timo@rothenpieler.org
State Accepted
Commit 06de593303d0ae88e2df36dc9054755ce33715ba
Headers show
Series [FFmpeg-devel] avfilter/frei0r: use win32dlfcn wrapper | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Timo Rothenpieler Sept. 5, 2021, 2:55 p.m. UTC 
---
 configure               | 7 ++++---
 libavfilter/vf_frei0r.c | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Timo Rothenpieler Sept. 8, 2021, 10:31 a.m. UTC | #1 
Will push soon
diff mbox series

Patch

diff --git a/configure b/configure
index af410a9d11..b4b5c7e138 100755
--- a/configure
+++ b/configure
@@ -3598,8 +3598,9 @@  firequalizer_filter_select="rdft"
 flite_filter_deps="libflite"
 framerate_filter_select="scene_sad"
 freezedetect_filter_select="scene_sad"
-frei0r_filter_deps="frei0r libdl"
-frei0r_src_filter_deps="frei0r libdl"
+frei0r_deps_any="libdl LoadLibrary"
+frei0r_filter_deps="frei0r"
+frei0r_src_filter_deps="frei0r"
 fspp_filter_deps="gpl"
 histeq_filter_deps="gpl"
 hqdn3d_filter_deps="gpl"
@@ -6385,7 +6386,7 @@  enabled cuda_nvcc         && { check_nvcc cuda_nvcc || die "ERROR: failed checki
 enabled chromaprint       && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
 enabled decklink          && { require_headers DeckLinkAPI.h &&
                                { test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a0b0000" || die "ERROR: Decklink API version must be >= 10.11"; } }
-enabled frei0r            && require_headers "frei0r.h dlfcn.h"
+enabled frei0r            && require_headers "frei0r.h"
 enabled gmp               && require gmp gmp.h mpz_export -lgmp
 enabled gnutls            && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
 enabled jni               && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 65191e1932..827f9c7082 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -22,12 +22,12 @@ 
  * frei0r wrapper
  */
 
-#include <dlfcn.h>
 #include <frei0r.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include "config.h"
+#include "compat/w32dlfcn.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/eval.h"