From 74a701993e6ce536f079dbcd6971dd8bd3a1973c Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 14 Jan 2005 18:12:24 +0000 Subject: [PATCH] =?UTF-8?q?sys/v4l/gstv4lelement.c:=20Revert=20Johan=C2=B4?= =?UTF-8?q?s=201.35->1.36=20since=20it=20breaks=20compat.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message from CVS: * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): Revert Johan´s 1.35->1.36 since it breaks compat. --- ChangeLog | 5 +++++ sys/v4l/gstv4lelement.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5215ffeb84..e1b7f8cee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-14 Ronald S. Bultje + + * sys/v4l/gstv4lelement.c: (gst_v4l_iface_supported): + Revert Johan´s 1.35->1.36 since it breaks compat. + 2005-01-14 Stephane LOEUILLET * ext/dv/gstdvdec.c: diff --git a/sys/v4l/gstv4lelement.c b/sys/v4l/gstv4lelement.c index 48a25ca0fb..01aac853a5 100644 --- a/sys/v4l/gstv4lelement.c +++ b/sys/v4l/gstv4lelement.c @@ -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; }