gst/gstpad.c: We are nice people. Return silently when the pad is negotiating.

Original commit message from CVS:
2004-02-17  Julien MOUTTE  <julien@moutte.net>

* gst/gstpad.c: (gst_pad_try_set_caps): We are nice people. Return
silently when the pad is negotiating.
This commit is contained in:
Julien Moutte 2004-02-16 23:40:32 +00:00
parent 4eedbdb4ef
commit 47a11ddf79
2 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2004-02-17 Julien MOUTTE <julien@moutte.net>
* 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 <thomas at apestaart dot org> 2004-02-16 Thomas Vander Stichele <thomas at apestaart dot org>
* docs/faq/Makefile.am: * docs/faq/Makefile.am:

View file

@ -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 (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_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 */ /* setting non-fixed caps on a pad is not allowed */
if (!gst_caps_is_fixed (caps)) { if (!gst_caps_is_fixed (caps)) {