mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/: g_assert() can be a macro, don't use #ifdef inside it.

Browse source 
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:
Ronald S. Bultje 2004-12-19 16:46:21 +00:00
parent 736bcb6ff7
commit 328abe52c4
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2004-12-19 Edward Hervey <bilboed@bilboed.com>
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>

8
sys/v4l2/gstv4l2element.c
View file

@ -85,11 +85,13 @@ gst_v4l2_iface_supported (GstImplementsInterface * iface, GType iface_type)
{ {
GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface); GstV4l2Element *v4l2element = GST_V4L2ELEMENT (iface);
g_assert (iface_type == GST_TYPE_TUNER ||
#ifdef HAVE_XVIDEO #ifdef HAVE_XVIDEO
iface_type == GST_TYPE_X_OVERLAY || g_assert (iface_type == GST_TYPE_TUNER ||
#endif 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); iface_type == GST_TYPE_COLOR_BALANCE);
#endif
if (v4l2element->video_fd == -1) if (v4l2element->video_fd == -1)
return FALSE; return FALSE;