Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
4064f428
Commit
4064f428
authored
Sep 24, 2017
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: Drop explicit check for dlfcn.h
It is detected as a part of the libdl check.
parent
fca9ca53
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
configure
configure
+0
-2
nvenc.c
libavcodec/nvenc.c
+4
-6
No files found.
configure
View file @
4064f428
...
@@ -1568,7 +1568,6 @@ HEADERS_LIST="
...
@@ -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
...
@@ -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
...
...
libavcodec/nvenc.c
View file @
4064f428
...
@@ -28,12 +28,7 @@
...
@@ -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 @@
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment