[FFmpeg-cvslog] lavd/v4l2: Use "int request" as second parameter for ioctl() on Android.

Carl Eugen Hoyos git at videolan.org
Tue Dec 11 01:50:54 EET 2018


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Thu Dec  6 23:34:54 2018 +0100| [73251678c83cbe24d08264da693411b166239bc7] | committer: Carl Eugen Hoyos

lavd/v4l2: Use "int request" as second parameter for ioctl() on Android.

Fixes build with new Android toolchain.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73251678c83cbe24d08264da693411b166239bc7
---

 libavdevice/v4l2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 10a0ff0dd6..1b9c6e760b 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);



More information about the ffmpeg-cvslog mailing list