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