From 47a11ddf799ab8bf6bad4f5f190de7a74e369008 Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Mon, 16 Feb 2004 23:40:32 +0000 Subject: [PATCH] gst/gstpad.c: We are nice people. Return silently when the pad is negotiating. Original commit message from CVS: 2004-02-17 Julien MOUTTE * gst/gstpad.c: (gst_pad_try_set_caps): We are nice people. Return silently when the pad is negotiating. --- ChangeLog | 5 +++++ gst/gstpad.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37aafa4254..574aa155a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-17 Julien MOUTTE + + * gst/gstpad.c: (gst_pad_try_set_caps): We are nice people. Return + silently when the pad is negotiating. + 2004-02-16 Thomas Vander Stichele * docs/faq/Makefile.am: diff --git a/gst/gstpad.c b/gst/gstpad.c index 4247750bed..d70e37215f 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1408,8 +1408,10 @@ gst_pad_try_set_caps (GstPad *pad, const GstCaps *caps) g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED); g_return_val_if_fail (GST_IS_REAL_PAD (pad), GST_PAD_LINK_REFUSED); - g_return_val_if_fail (!GST_FLAG_IS_SET (pad, GST_PAD_NEGOTIATING), - GST_PAD_LINK_REFUSED); + + /* If the pad is negotiating we refuse this try */ + if (GST_FLAG_IS_SET (pad, GST_PAD_NEGOTIATING)) + return GST_PAD_LINK_REFUSED; /* setting non-fixed caps on a pad is not allowed */ if (!gst_caps_is_fixed (caps)) {