[FFmpeg-cvslog] cmdutils: check for SetDllDirectory() availability
James Almer
git at videolan.org
Tue Aug 23 04:29:39 EEST 2016
ffmpeg | branch: release/3.0 | James Almer <jamrial at gmail.com> | Mon Aug 22 19:24:31 2016 -0300| [61fcba75464a6f4766bcf49e12cad8bc1d03379b] | committer: James Almer
cmdutils: check for SetDllDirectory() availability
It's only available on Windows XP or newer.
Should fix compilation with mingw32 using the default OS target.
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61fcba75464a6f4766bcf49e12cad8bc1d03379b
---
cmdutils.c | 2 +-
configure | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/cmdutils.c b/cmdutils.c
index 6960f8c..a725e77 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -109,7 +109,7 @@ static void log_callback_report(void *ptr, int level, const char *fmt, va_list v
void init_dynload(void)
{
-#ifdef _WIN32
+#if HAVE_SETDLLDIRECTORY
/* Calling SetDllDirectory with the empty string (but not NULL) removes the
* current working directory from the DLL search path as a security pre-caution. */
SetDllDirectory("");
diff --git a/configure b/configure
index 1091bdc..c9c139e 100755
--- a/configure
+++ b/configure
@@ -1900,6 +1900,7 @@ SYSTEM_FUNCS="
sched_getaffinity
SetConsoleTextAttribute
SetConsoleCtrlHandler
+ SetDllDirectory
setmode
setrlimit
Sleep
@@ -5317,6 +5318,7 @@ check_func_headers windows.h MapViewOfFile
check_func_headers windows.h PeekNamedPipe
check_func_headers windows.h SetConsoleTextAttribute
check_func_headers windows.h SetConsoleCtrlHandler
+check_func_headers windows.h SetDllDirectory
check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc
check_struct windows.h "CONDITION_VARIABLE" Ptr
More information about the ffmpeg-cvslog
mailing list