[FFmpeg-devel] [PATCH] lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's

Marton Balint cus at passwd.hu
Wed May 8 00:49:51 EEST 2024



On Sun, 5 May 2024, Brad Smith wrote:

> lavd/v4l2: Use proper field type for second parameter of ioctl() with BSD's
>
> The proper type was used until 73251678c83cbe24d08264da693411b166239bc7.
>
> This covers all of the OS's that currently have V4L2 support, permutations
> of Linux glibc/musl, Android bionic, FreeBSD, NetBSD, OpenBSD, Solaris.
>
> Copied from FreeBSD ports patch.
>
> Signed-off-by: Brad Smith <brad at comstyle.com>
> ---
> libavdevice/v4l2.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
> index 3706582bc6..74f43ef6a9 100644
> --- a/libavdevice/v4l2.c
> +++ b/libavdevice/v4l2.c
> @@ -108,10 +108,10 @@ struct video_data {
>     int (*open_f)(const char *file, int oflag, ...);
>     int (*close_f)(int fd);
>     int (*dup_f)(int fd);
> -#ifdef __GLIBC__
> -    int (*ioctl_f)(int fd, unsigned long int request, ...);
> -#else
> +#if defined(__sun) || defined(__BIONIC__) || defined(__musl__) /* POSIX-like */
>     int (*ioctl_f)(int fd, int request, ...);
> +#else
> +    int (*ioctl_f)(int fd, unsigned long int request, ...);
> #endif
>     ssize_t (*read_f)(int fd, void *buffer, size_t n);
>     void *(*mmap_f)(void *start, size_t length, int prot, int flags, int fd, int64_t offset);

Will apply.

Thanks,
Marton


More information about the ffmpeg-devel mailing list