From 04a9e93e8e617309d4e52675f25c6fc8c05f7e88 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Thu, 11 Nov 2004 14:25:11 +0000 Subject: sys/v4l2/gstv4l2element.c: Fix compilation if HAVE_XVIDEO is not defined Original commit message from CVS: 2004-11-11 Zaheer Abbas Merali * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported): Fix compilation if HAVE_XVIDEO is not defined --- ChangeLog | 5 +++++ sys/v4l2/gstv4l2element.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 58cfbac1..fe503022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-11 Zaheer Abbas Merali + + * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported): + Fix compilation if HAVE_XVIDEO is not defined + 2004-11-11 Zaheer Abbas Merali * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): 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; } -- cgit v1.2.1