Martin Storsjo : avicap32: Fix compilation with older videodev2.h.
Alexandre Julliard
julliard at winehq.org
Mon Apr 29 16:08:50 CDT 2019
Module: wine
Branch: master
Commit: b10cdce31da978cb458c46a5ac55acd184ab7713
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b10cdce31da978cb458c46a5ac55acd184ab7713
Author: Martin Storsjo <martin at martin.st>
Date: Sat Apr 27 22:06:59 2019 +0300
avicap32: Fix compilation with older videodev2.h.
Older videodev2.h lack the V4L2_CAP_DEVICE_CAPS define and
the device_caps field in the v4l2_capability struct.
Signed-off-by: Martin Storsjo <martin at martin.st>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/avicap32/avicap32_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c
index 1c4170e..9e2a99d 100644
--- a/dlls/avicap32/avicap32_main.c
+++ b/dlls/avicap32/avicap32_main.c
@@ -129,9 +129,11 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi
memset(&caps, 0, sizeof(caps));
if (xioctl(fd, VIDIOC_QUERYCAP, &caps) != -1) {
BOOL isCaptureDevice;
+#ifdef V4L2_CAP_DEVICE_CAPS
if (caps.capabilities & V4L2_CAP_DEVICE_CAPS)
isCaptureDevice = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE;
else
+#endif
isCaptureDevice = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE;
if (isCaptureDevice) {
lstrcpynA(name, (char *)caps.card, namesize);
More information about the wine-cvs
mailing list