From: <bi...@ke...> - 2010-07-12 17:15:14
|
Module: gnonlin Branch: master Commit: 4331e24bac535e0516516a7e207c031923a4e90e URL: http://cgit.freedesktop.org/gstreamer/gnonlin/commit/?id=4331e24bac535e0516516a7e207c031923a4e90e Author: Edward Hervey <bi...@bi...> Date: Mon Jul 12 19:14:24 2010 +0200 gnlcomposition: Use fast pad linking some more --- gnl/gnlcomposition.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c index c56efb4..910651c 100644 --- a/gnl/gnlcomposition.c +++ b/gnl/gnlcomposition.c @@ -1863,7 +1863,8 @@ compare_relink_single_node (GnlComposition * comp, GNode * node, GST_WARNING_OBJECT (comp, "Couldn't find an unlinked sinkpad from %s", GST_ELEMENT_NAME (newparent)); } else { - if (G_UNLIKELY (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK)) { + if (G_UNLIKELY (gst_pad_link_full (srcpad, sinkpad, + GST_PAD_LINK_CHECK_NOTHING) != GST_PAD_LINK_OK)) { GST_WARNING_OBJECT (comp, "Failed to link pads"); } gst_object_unref (sinkpad); |