RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: Drop explicit check for dlfcn.h 

It is detected as a part of the libdl check.
This commit is contained in:
Diego Biurrun 2017-09-24 19:39:29 +02:00
parent fca9ca539c
commit 4064f42889
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1568,7 +1568,6 @@ HEADERS_LIST="
dev_video_bktr_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h
dev_video_meteor_ioctl_meteor_h dev_video_meteor_ioctl_meteor_h
direct_h direct_h
dlfcn_h
dxgidebug_h dxgidebug_h
dxva_h dxva_h
gsm_h gsm_h
@ -4658,7 +4657,6 @@ check_struct windows.h "CONDITION_VARIABLE" Ptr
check_header d3d11.h check_header d3d11.h
check_header direct.h check_header direct.h
check_header dlfcn.h
check_header dxgidebug.h check_header dxgidebug.h
check_header dxva.h check_header dxva.h
check_header dxva2api.h check_header dxva2api.h

10
libavcodec/nvenc.c
View File

@ -28,12 +28,7 @@
#define CUDA_LIBNAME "libcuda.so" #define CUDA_LIBNAME "libcuda.so"
#if HAVE_DLFCN_H #if HAVE_WINDOWS_H
#include <dlfcn.h>
#define NVENC_LIBNAME "libnvidia-encode.so"
#elif HAVE_WINDOWS_H
#include <windows.h> #include <windows.h>
#if ARCH_X86_64 #if ARCH_X86_64
@ -45,6 +40,9 @@
#define dlopen(filename, flags) LoadLibrary((filename)) #define dlopen(filename, flags) LoadLibrary((filename))
#define dlsym(handle, symbol) GetProcAddress(handle, symbol) #define dlsym(handle, symbol) GetProcAddress(handle, symbol)
#define dlclose(handle) FreeLibrary(handle) #define dlclose(handle) FreeLibrary(handle)
#else
#include <dlfcn.h>
#define NVENC_LIBNAME "libnvidia-encode.so"
#endif #endif
#include "libavutil/common.h" #include "libavutil/common.h"