sys/v4l/gstv4lelement.c: Revert Johan´s 1.35->1.36 since it breaks compat.

Original commit message from CVS:
* sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported):
Revert Johan´s 1.35->1.36 since it breaks compat.
This commit is contained in:
Ronald S. Bultje 2005-01-14 18:12:24 +00:00
parent a6f75b9e14
commit 74a701993e
2 changed files with 13 additions and 0 deletions

View file

@ -1,3 +1,8 @@
2005-01-14 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported):
Revert Johan´s 1.35->1.36 since it breaks compat.
2005-01-14 Stephane LOEUILLET <stephane.loeuillet@tiscali.fr>
* ext/dv/gstdvdec.c:

View file

@ -81,6 +81,8 @@ static guint gst_v4lelement_signals[LAST_SIGNAL] = { 0 };
static gboolean
gst_v4l_iface_supported (GstImplementsInterface * iface, GType iface_type)
{
GstV4lElement *v4lelement = GST_V4LELEMENT (iface);
#ifdef HAVE_XVIDEO
g_assert (iface_type == GST_TYPE_TUNER ||
iface_type == GST_TYPE_X_OVERLAY || iface_type == GST_TYPE_COLOR_BALANCE);
@ -89,6 +91,12 @@ gst_v4l_iface_supported (GstImplementsInterface * iface, GType iface_type)
iface_type == GST_TYPE_COLOR_BALANCE);
#endif
if (v4lelement->video_fd == -1)
return FALSE;
if (iface_type == GST_TYPE_X_OVERLAY && !GST_V4L_IS_OVERLAY (v4lelement))
return FALSE;
return TRUE;
}