From 197db577e832ad033954885e2a3a7fad4046968c Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 9 Jan 2015 04:53:19 +0000 Subject: [PATCH] v4l2: fix build on systems with older kernel headers * v4l2.c (print_v4l2_format_fmt): Do not use V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY unless it is defined. (v4l2_ioctl): Do not use VIDIOC_ENUM_FRAMESIZES and VIDIOC_ENUM_FRAMEINTERVALS unless they are defined. --- v4l2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v4l2.c b/v4l2.c index 7d5a3fac..b89928b4 100644 --- a/v4l2.c +++ b/v4l2.c @@ -126,7 +126,9 @@ static void print_v4l2_format_fmt(const struct v4l2_format *f) /* TODO: Complete this switch statement */ case V4L2_BUF_TYPE_VIDEO_OVERLAY: +#if HAVE_DECL_V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: +#endif tprints("win={???}"); break; @@ -173,6 +175,7 @@ v4l2_ioctl(struct tcb *tcp, unsigned long code, long arg) return 1; } +#ifdef VIDIOC_ENUM_FRAMESIZES case VIDIOC_ENUM_FRAMESIZES: /* decode on exit */ { struct v4l2_frmsizeenum s; @@ -202,6 +205,7 @@ v4l2_ioctl(struct tcb *tcp, unsigned long code, long arg) tprints("}"); return 1; } +#endif /* VIDIOC_ENUM_FRAMESIZES */ case VIDIOC_G_FMT: case VIDIOC_S_FMT: @@ -450,6 +454,7 @@ v4l2_ioctl(struct tcb *tcp, unsigned long code, long arg) return 1; } +#ifdef VIDIOC_ENUM_FRAMEINTERVALS case VIDIOC_ENUM_FRAMEINTERVALS: { struct v4l2_frmivalenum f; @@ -480,6 +485,7 @@ v4l2_ioctl(struct tcb *tcp, unsigned long code, long arg) tprints("}"); return 1; } +#endif /* VIDIOC_ENUM_FRAMEINTERVALS */ case VIDIOC_CROPCAP: { struct v4l2_cropcap c; -- 2.40.0