summaryrefslogtreecommitdiff
path: root/v4l2.c
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2015-01-09 04:53:19 +0000
committerDmitry V. Levin <ldv@altlinux.org>2015-01-09 04:53:19 +0000
commit197db577e832ad033954885e2a3a7fad4046968c (patch)
tree40ed842462709114278c5d1369adddd05f2e13af /v4l2.c
parent08b6397d13580fd82450a43f3a65237041679421 (diff)
downloadstrace-197db577e832ad033954885e2a3a7fad4046968c.tar.gz
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.
Diffstat (limited to 'v4l2.c')
-rw-r--r--v4l2.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/v4l2.c b/v4l2.c
index 7d5a3facd..b89928b4d 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;