[FFmpeg-cvslog] configure: improve check for POSIX ioctl
Ramiro Polla
git at videolan.org
Mon Sep 2 03:11:08 EEST 2024
ffmpeg | branch: release/5.0 | Ramiro Polla <ramiro.polla at gmail.com> | Thu Aug 29 15:40:00 2024 +0200| [76e4a113aed85093010c906be82543c34d009771] | committer: Brad Smith
configure: improve check for POSIX ioctl
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 00b64fca55a3a009c9d0e391c85f4fd3291e5d12)
Signed-off-by: Brad Smith <brad at comstyle.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76e4a113aed85093010c906be82543c34d009771
---
configure | 2 ++
libavdevice/v4l2.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 37194e51c5..0b0a17cd98 100755
--- a/configure
+++ b/configure
@@ -2409,6 +2409,7 @@ HAVE_LIST="
opencl_vaapi_intel_media
perl
pod2man
+ posix_ioctl
texi2html
xmllint
zlib_gzip
@@ -6789,6 +6790,7 @@ xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
check_headers linux/fb.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 sys/ioctl.h "int ioctl(int, int, ...)" && enable posix_ioctl
# check V4L2 codecs available in the API
if enabled v4l2_m2m; then
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 9e776df0ba..48bf9e231b 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -97,7 +97,7 @@ struct video_data {
int (*open_f)(const char *file, int oflag, ...);
int (*close_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, ...);
#else
int (*ioctl_f)(int fd, unsigned long int request, ...);
More information about the ffmpeg-cvslog
mailing list