|
 |
860d70 |
From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001
|
|
|
860d70 |
From: Colin Walters <walters@verbum.org>
|
|
|
860d70 |
Date: Thu, 2 May 2013 16:16:46 -0400
|
|
|
860d70 |
Subject: [PATCH] sys/v4l2: Some blind compilation fixes
|
|
|
860d70 |
|
|
|
860d70 |
---
|
|
|
860d70 |
sys/v4l2/gstv4l2bufferpool.c | 1 -
|
|
|
860d70 |
sys/v4l2/v4l2_calls.c | 12 ++++--------
|
|
|
860d70 |
2 files changed, 4 insertions(+), 9 deletions(-)
|
|
|
860d70 |
|
|
|
860d70 |
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
|
|
|
860d70 |
index a0b4c84..3916815 100644
|
|
|
860d70 |
--- a/sys/v4l2/gstv4l2bufferpool.c
|
|
|
860d70 |
+++ b/sys/v4l2/gstv4l2bufferpool.c
|
|
|
860d70 |
@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
|
|
|
860d70 |
GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
|
|
|
860d70 |
ret->vbuffer.m.offset);
|
|
|
860d70 |
GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
|
|
|
860d70 |
- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
|
|
|
860d70 |
|
|
|
860d70 |
ret->mmap_length = ret->vbuffer.length;
|
|
|
860d70 |
data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
|
|
|
860d70 |
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
|
|
|
860d70 |
index 309bfb6..ee3ff9f 100644
|
|
|
860d70 |
--- a/sys/v4l2/v4l2_calls.c
|
|
|
860d70 |
+++ b/sys/v4l2/v4l2_calls.c
|
|
|
860d70 |
@@ -53,14 +53,6 @@
|
|
|
860d70 |
|
|
|
860d70 |
#include "gst/gst-i18n-plugin.h"
|
|
|
860d70 |
|
|
|
860d70 |
-/* Those are ioctl calls */
|
|
|
860d70 |
-#ifndef V4L2_CID_HCENTER
|
|
|
860d70 |
-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
|
|
|
860d70 |
-#endif
|
|
|
860d70 |
-#ifndef V4L2_CID_VCENTER
|
|
|
860d70 |
-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
|
|
|
860d70 |
-#endif
|
|
|
860d70 |
-
|
|
|
860d70 |
GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
|
|
|
860d70 |
#define GST_CAT_DEFAULT v4l2_debug
|
|
|
860d70 |
|
|
|
860d70 |
@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
|
|
|
860d70 |
break;
|
|
|
860d70 |
case V4L2_CID_HFLIP:
|
|
|
860d70 |
case V4L2_CID_VFLIP:
|
|
|
860d70 |
+#ifdef V4L2_CID_HCENTER
|
|
|
860d70 |
case V4L2_CID_HCENTER:
|
|
|
860d70 |
+#endif
|
|
|
860d70 |
+#ifdef V4L2_CID_VCENTER
|
|
|
860d70 |
case V4L2_CID_VCENTER:
|
|
|
860d70 |
+#endif
|
|
|
860d70 |
#ifdef V4L2_CID_PAN_RESET
|
|
|
860d70 |
case V4L2_CID_PAN_RESET:
|
|
|
860d70 |
#endif
|
|
|
860d70 |
--
|
|
|
860d70 |
1.7.1
|
|
|
860d70 |
|