summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-08-09 07:35:23 (GMT)
committerTim-Philipp Müller <tim@centricular.net>2012-08-09 07:40:33 (GMT)
commit9f2aa8d47f835ea155aaf635f618c0fc1ca87012 (patch)
tree01517b13c230cd686ceb31e1b7841935a95f3acd
parent264bcf7d6f3fab8219479ae9b062842856b0e255 (diff)
v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
This was unused apparently and removed in the kernel in commit: From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 From: Sakari Ailus <sakari.ailus@iki.fi> Date: Wed, 2 May 2012 09:40:03 -0300 Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which tells the former is valid. The flag is used by no driver currently. https://bugzilla.gnome.org/show_bug.cgi?id=681491 Conflicts: sys/v4l2/gstv4l2bufferpool.c
-rw-r--r--sys/v4l2/gstv4l2bufferpool.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
index d040d9d..897231d 100644
--- a/sys/v4l2/gstv4l2bufferpool.c
+++ b/sys/v4l2/gstv4l2bufferpool.c
@@ -175,7 +175,6 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
if (meta->vbuffer.memory == V4L2_MEMORY_MMAP)
GST_LOG_OBJECT (pool, " MMAP offset: %u", meta->vbuffer.m.offset);
GST_LOG_OBJECT (pool, " length: %u", meta->vbuffer.length);
- GST_LOG_OBJECT (pool, " input: %u", meta->vbuffer.input);
meta->mem = v4l2_mmap (0, meta->vbuffer.length,
PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,