mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'
* commit '68649bfed30a35dc3e45ea240541b2774b2f282b': configure: Group system feature variables and system libraries together Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
3749d0defc
|
@ -1986,6 +1986,17 @@ MATH_FUNCS="
|
||||||
truncf
|
truncf
|
||||||
"
|
"
|
||||||
|
|
||||||
|
SYSTEM_FEATURES="
|
||||||
|
atomics_native
|
||||||
|
dos_paths
|
||||||
|
libc_msvcrt
|
||||||
|
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
|
||||||
|
section_data_rel_ro
|
||||||
|
threads
|
||||||
|
uwp
|
||||||
|
winrt
|
||||||
|
"
|
||||||
|
|
||||||
SYSTEM_FUNCS="
|
SYSTEM_FUNCS="
|
||||||
access
|
access
|
||||||
aligned_malloc
|
aligned_malloc
|
||||||
|
@ -2037,6 +2048,13 @@ SYSTEM_FUNCS="
|
||||||
wglGetProcAddress
|
wglGetProcAddress
|
||||||
"
|
"
|
||||||
|
|
||||||
|
SYSTEM_LIBRARIES="
|
||||||
|
vaapi_drm
|
||||||
|
vaapi_x11
|
||||||
|
vdpau_x11
|
||||||
|
wincrypt
|
||||||
|
"
|
||||||
|
|
||||||
TOOLCHAIN_FEATURES="
|
TOOLCHAIN_FEATURES="
|
||||||
as_arch_directive
|
as_arch_directive
|
||||||
as_fpu_directive
|
as_fpu_directive
|
||||||
|
@ -2093,27 +2111,17 @@ HAVE_LIST="
|
||||||
$HEADERS_LIST
|
$HEADERS_LIST
|
||||||
$INTRINSICS_LIST
|
$INTRINSICS_LIST
|
||||||
$MATH_FUNCS
|
$MATH_FUNCS
|
||||||
|
$SYSTEM_FEATURES
|
||||||
$SYSTEM_FUNCS
|
$SYSTEM_FUNCS
|
||||||
|
$SYSTEM_LIBRARIES
|
||||||
$THREADS_LIST
|
$THREADS_LIST
|
||||||
$TOOLCHAIN_FEATURES
|
$TOOLCHAIN_FEATURES
|
||||||
$TYPES_LIST
|
$TYPES_LIST
|
||||||
atomics_native
|
|
||||||
dos_paths
|
|
||||||
libc_msvcrt
|
|
||||||
makeinfo
|
makeinfo
|
||||||
makeinfo_html
|
makeinfo_html
|
||||||
MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
|
|
||||||
perl
|
perl
|
||||||
pod2man
|
pod2man
|
||||||
section_data_rel_ro
|
|
||||||
texi2html
|
texi2html
|
||||||
threads
|
|
||||||
uwp
|
|
||||||
vaapi_drm
|
|
||||||
vaapi_x11
|
|
||||||
vdpau_x11
|
|
||||||
winrt
|
|
||||||
wincrypt
|
|
||||||
"
|
"
|
||||||
|
|
||||||
# options emitted with CONFIG_ prefix but not available on the command line
|
# options emitted with CONFIG_ prefix but not available on the command line
|
||||||
|
|
Loading…
Reference in New Issue