summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2004-11-11 14:25:11 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2004-11-11 14:25:11 +0000
commit04a9e93e8e617309d4e52675f25c6fc8c05f7e88 (patch)
tree5536a7fcd935b6b7fe159bd94fb0ebe284e54254
parent88edfe8688ab2deb05e38b0f789ace09d033847f (diff)
downloadgst-plugins-bad-04a9e93e8e617309d4e52675f25c6fc8c05f7e88.tar.gz
gst-plugins-bad-04a9e93e8e617309d4e52675f25c6fc8c05f7e88.tar.bz2
gst-plugins-bad-04a9e93e8e617309d4e52675f25c6fc8c05f7e88.zip
sys/v4l2/gstv4l2element.c: Fix compilation if HAVE_XVIDEO is not defined
Original commit message from CVS: 2004-11-11 Zaheer Abbas Merali <zaheerabbas at merali dot org> * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported): Fix compilation if HAVE_XVIDEO is not defined
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l2/gstv4l2element.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 58cfbac1..fe503022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2004-11-11 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported):
+ Fix compilation if HAVE_XVIDEO is not defined
+
+2004-11-11 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
* sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported):
Fix compilation if HAVE_XVIDEO is not defined
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c
index 743b3b70..f8d980c0 100644
--- a/sys/v4l2/gstv4l2element.c
+++ b/sys/v4l2/gstv4l2element.c
@@ -86,13 +86,18 @@ gst_v4l2_iface_supported (GstImplementsInterface * iface, GType iface_type)
GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface);
g_assert (iface_type == GST_TYPE_TUNER ||
- iface_type == GST_TYPE_X_OVERLAY || iface_type == GST_TYPE_COLOR_BALANCE);
+#ifdef HAVE_XVIDEO
+ iface_type == GST_TYPE_X_OVERLAY ||
+#endif
+ iface_type == GST_TYPE_COLOR_BALANCE);
if (v4l2element->video_fd == -1)
return FALSE;
+#ifdef HAVE_XVIDEO
if (iface_type == GST_TYPE_X_OVERLAY && !GST_V4L2_IS_OVERLAY (v4l2element))
return FALSE;
+#endif
return TRUE;
}