Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
20f09020
Commit
20f09020
authored
Aug 31, 2016
by
Timo Rothenpieler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: fix nvenc detection logic
parent
99882d05
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
15 deletions
+19
-15
configure
configure
+19
-15
No files found.
configure
View file @
20f09020
...
...
@@ -3205,7 +3205,7 @@ enable audiotoolbox
enable
d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
enable
xlib
enable
vda_framework videotoolbox videotoolbox_encoder
enable
nvenc
vda_framework videotoolbox videotoolbox_encoder
# build settings
SHFLAGS
=
'-shared -Wl,-soname,$$(@F)'
...
...
@@ -5992,22 +5992,26 @@ enabled vdpau && enabled xlib &&
check_lib2
"vdpau/vdpau.h vdpau/vdpau_x11.h"
vdp_device_create_x11
-lvdpau
&&
enable
vdpau_x11
case
$target_os
in
mingw32
*
|
mingw64
*
|
win32|win64|linux|cygwin
*
)
disabled nvenc
||
enable
nvenc
;;
*
)
disable nvenc
;;
esac
if
enabled nvenc
;
then
{
echo
'#include "compat/nvenc/nvEncodeAPI.h"'
echo
'int main(void) { return 0; }'
}
| check_cc
-I
$source_path
||
disable nvenc
if
enabled x86
;
then
case
$target_os
in
mingw32
*
|
mingw64
*
|
win32|win64|linux|cygwin
*
)
;;
*
)
disable nvenc
;;
esac
else
disable nvenc
fi
enabled nvenc
&&
check_cc
-I
$source_path
<<
EOF
|| disable nvenc
#include "compat/nvenc/nvEncodeAPI.h"
NV_ENCODE_API_FUNCTION_LIST flist;
void f(void) { struct { const GUID guid; } s[] = { { NV_ENC_PRESET_HQ_GUID } }; }
int main(void) { return 0; }
EOF
# Funny iconv installations are not unusual, so check it after all flags have been set
disabled iconv
||
check_func_headers iconv.h iconv
||
check_lib2 iconv.h iconv
-liconv
||
disable iconv
...
...
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