virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

configure: improve check for POSIX ioctl

Browse Source 
Instead of relying on system #ifdefs which may or may not be correct,
detect the POSIX ioctl signature at configure time.

(cherry picked from commit 00b64fca55)
Signed-off-by: Brad Smith <brad@comstyle.com>
This commit is contained in:
Ramiro Polla 2024-08-29 15:40:00 +02:00 committed by Brad Smith
parent df5a848c83
commit ed09f56097
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2415,6 +2415,7 @@ HAVE_LIST="
opencl_vaapi_intel_media opencl_vaapi_intel_media
perl perl
pod2man pod2man
posix_ioctl
texi2html texi2html
xmllint xmllint
zlib_gzip zlib_gzip
@ -6805,6 +6806,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
check_headers linux/fb.h check_headers linux/fb.h
check_headers linux/videodev2.h check_headers linux/videodev2.h
test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
test_code cc sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
# check V4L2 codecs available in the API # check V4L2 codecs available in the API
if enabled v4l2_m2m; then if enabled v4l2_m2m; then

2
libavdevice/v4l2.c
View File

@ -106,7 +106,7 @@ struct video_data {
int (*open_f)(const char *file, int oflag, ...); int (*open_f)(const char *file, int oflag, ...);
int (*close_f)(int fd); int (*close_f)(int fd);
int (*dup_f)(int fd); int (*dup_f)(int fd);
#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */ #if HAVE_POSIX_IOCTL
int (*ioctl_f)(int fd, int request, ...); int (*ioctl_f)(int fd, int request, ...);
#else #else
int (*ioctl_f)(int fd, unsigned long int request, ...); int (*ioctl_f)(int fd, unsigned long int request, ...);