virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

configure: fix nvenc detection logic

Browse Source
This commit is contained in:
Timo Rothenpieler
2016-08-31 15:40:00 +02:00
parent 99882d05a6
commit 20f0902010
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure vendored
View File

@@ -3205,7 +3205,7 @@ enable audiotoolbox
enable d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc enable d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc
enable xlib enable xlib
enable vda_framework videotoolbox videotoolbox_encoder enable nvenc vda_framework videotoolbox videotoolbox_encoder
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' 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 && check_lib2 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
enable vdpau_x11 enable vdpau_x11
case $target_os in if enabled x86; then
mingw32*|mingw64*|win32|win64|linux|cygwin*) case $target_os in
disabled nvenc || enable nvenc mingw32*|mingw64*|win32|win64|linux|cygwin*)
;; ;;
*) *)
disable nvenc disable nvenc
;; ;;
esac esac
else
if enabled nvenc; then disable nvenc
{
echo '#include "compat/nvenc/nvEncodeAPI.h"'
echo 'int main(void) { return 0; }'
} | check_cc -I$source_path || disable nvenc
fi 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 # 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 disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv