summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-09-04 09:32:42 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-09-04 09:32:42 +0200
commit686f8376a833bbf12749198111a1e24fb9781e78 (patch)
treee803ed4a92287d38282f074ac8638d7a55e0addb /sys
parentb35b752c41c6b207db862309d6fae4e0977635f2 (diff)
v4l2: Define V4L2_FMT_FLAG_EMULATED if it's not defined yet
libv4l2 already uses this flag, even on Linux kernel versions before 2.6.32.
Diffstat (limited to 'sys')
-rw-r--r--sys/v4l2/gstv4l2object.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
index cae86cef..81fabfd8 100644
--- a/sys/v4l2/gstv4l2object.c
+++ b/sys/v4l2/gstv4l2object.c
@@ -719,15 +719,18 @@ gst_v4l2_object_get_format_from_fourcc (GstV4l2Object * v4l2object,
#define GREY_BASE_RANK 5
#define PWC_BASE_RANK 1
+/* This flag is already used by libv4l2 although
+ * it was added to the Linux kernel in 2.6.32
+ */
+#ifndef V4L2_FMT_FLAG_EMULATED
+#define V4L2_FMT_FLAG_EMULATED 0x0002
+#endif
+
static gint
gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
{
guint32 fourcc = fmt->pixelformat;
-#ifdef V4L2_FMT_FLAG_EMULATED
gboolean emulated = ((fmt->flags & V4L2_FMT_FLAG_EMULATED) != 0);
-#else
- gboolean emulated = FALSE;
-#endif
gint rank = 0;
switch (fourcc) {