mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 13:18:52 +00:00
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.
This commit is contained in:
parent
736bcb6ff7
commit
328abe52c4
2 changed files with 11 additions and 3 deletions
|
@ -1,3 +1,9 @@
|
|||
2004-12-19 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* 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.
|
||||
|
||||
2004-12-19 Edward Hervey <bilboed@bilboed.com>
|
||||
|
||||
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue