From 410af4fe504d97c823f241f0c77b826e42899106 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Wed, 30 Jan 2008 13:12:24 +0000 Subject: [PATCH] gst/gstutils.c: Check if caps are not NULL (fix bug #510194) Original commit message from CVS: * gst/gstutils.c: Check if caps are not NULL (fix bug #510194) --- gst/gstutils.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gst/gstutils.c b/gst/gstutils.c index 583e8caf01..7a1dacff13 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -1551,8 +1551,7 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname, gst_element_get_request_pad (src, srctempl->name_template); destpad = gst_element_get_request_pad (dest, desttempl->name_template); - if (srcpad && destpad - && pad_link_maybe_ghosting (srcpad, destpad)) { + if (pad_link_maybe_ghosting (srcpad, destpad)) { GST_CAT_DEBUG (GST_CAT_ELEMENT_PADS, "linked pad %s:%s to pad %s:%s", GST_DEBUG_PAD_NAME (srcpad), GST_DEBUG_PAD_NAME (destpad)); @@ -1561,10 +1560,8 @@ gst_element_link_pads (GstElement * src, const gchar * srcpadname, return TRUE; } /* it failed, so we release the request pads */ - if (srcpad) - gst_element_release_request_pad (src, srcpad); - if (destpad) - gst_element_release_request_pad (dest, destpad); + gst_element_release_request_pad (src, srcpad); + gst_element_release_request_pad (dest, destpad); } } }