Skip to content

GitLab

Commit 70aaa23d authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix compilation if some V4L2 definition are not present.

parent 0c2e81ed
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
src/msv4l2.c
View file @ 70aaa23d
...@@ -635,8 +635,15 @@ static void msv4l2_detect(MSWebCamManager *obj){ ...@@ -635,8 +635,15 @@ static void msv4l2_detect(MSWebCamManager *obj){
camera_caps = cap.device_caps; camera_caps = cap.device_caps;
} }
#endif #endif
if (((camera_caps & V4L2_CAP_VIDEO_CAPTURE) || (camera_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE)) if (((camera_caps & V4L2_CAP_VIDEO_CAPTURE)
&& !((camera_caps & V4L2_CAP_VIDEO_OUTPUT) || (camera_caps & V4L2_CAP_VIDEO_OUTPUT_MPLANE))) { #ifdef V4L2_CAP_VIDEO_CAPTURE_MPLANE
|| (camera_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE)
#endif
) && !((camera_caps & V4L2_CAP_VIDEO_OUTPUT)
#ifdef V4L2_CAP_VIDEO_OUTPUT_MPLANE
|| (camera_caps & V4L2_CAP_VIDEO_OUTPUT_MPLANE)
#endif
)) {
MSWebCam *cam=ms_web_cam_new(&v4l2_card_desc); MSWebCam *cam=ms_web_cam_new(&v4l2_card_desc);
cam->name=ms_strdup(devname); cam->name=ms_strdup(devname);
ms_web_cam_manager_add_cam(obj,cam); ms_web_cam_manager_add_cam(obj,cam);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment