diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-12-06 23:34:54 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-12-11 00:49:22 +0100 |
| commit | 73251678c83cbe24d08264da693411b166239bc7 (patch) | |
| tree | 5b8434a6fd5d90d11673b712f1889a1197e0c5b1 /libavdevice/v4l2.c | |
| parent | 73abde61bb07a302bd1c47620f97b9d08148f158 (diff) | |
| download | ffmpeg-streaming-73251678c83cbe24d08264da693411b166239bc7.zip ffmpeg-streaming-73251678c83cbe24d08264da693411b166239bc7.tar.gz | |
lavd/v4l2: Use "int request" as second parameter for ioctl() on Android.
Fixes build with new Android toolchain.
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 10a0ff0..1b9c6e7 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -95,7 +95,11 @@ 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 + int (*ioctl_f)(int fd, 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); int (*munmap_f)(void *_start, size_t length); |
