summaryrefslogtreecommitdiffstats
path: root/sys/v4l2
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-19 16:46:21 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-19 16:46:21 +0000
commit0eb578a008756b497544e2dd252fafa881ed02fd (patch)
tree03779c27bd8491931786a27e5577e122694b6c89 /sys/v4l2
parent277b2548be0370edaa755edf3406af57e947c822 (diff)
downloadgst-plugins-bad-0eb578a008756b497544e2dd252fafa881ed02fd.tar.gz
gst-plugins-bad-0eb578a008756b497544e2dd252fafa881ed02fd.tar.bz2
gst-plugins-bad-0eb578a008756b497544e2dd252fafa881ed02fd.zip
sys/: g_assert() can be a macro, don't use #ifdef inside it.
Original commit message from CVS: * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): * sys/v4l2/gstv4l2element.c: (gst_v4l2_iface_supported): g_assert() can be a macro, don't use #ifdef inside it.
Diffstat (limited to 'sys/v4l2')
-rw-r--r--sys/v4l2/gstv4l2element.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c
index f8d980c0..09953c94 100644
--- a/sys/v4l2/gstv4l2element.c
+++ b/sys/v4l2/gstv4l2element.c
@@ -85,11 +85,13 @@ gst_v4l2_iface_supported (GstImplementsInterface * iface, GType iface_type)
{
GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface);
- g_assert (iface_type == GST_TYPE_TUNER ||
#ifdef HAVE_XVIDEO
- iface_type == GST_TYPE_X_OVERLAY ||
-#endif
+ g_assert (iface_type == GST_TYPE_TUNER ||
+ iface_type == GST_TYPE_X_OVERLAY || iface_type == GST_TYPE_COLOR_BALANCE);
+#else
+ g_assert (iface_type == GST_TYPE_TUNER ||
iface_type == GST_TYPE_COLOR_BALANCE);
+#endif
if (v4l2element->video_fd == -1)
return FALSE;