diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 67f73b7026..293bc6137d 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1344,7 +1344,7 @@ gst_pad_is_linked gst_pad_can_link gst_pad_get_caps -gst_pad_get_caps_refed +gst_pad_get_caps_reffed gst_pad_get_allowed_caps gst_pad_get_negotiated_caps gst_pad_get_pad_template_caps @@ -1352,7 +1352,7 @@ gst_pad_set_caps gst_pad_get_peer gst_pad_peer_get_caps -gst_pad_peer_get_caps_refed +gst_pad_peer_get_caps_reffed gst_pad_use_fixed_caps gst_pad_is_active diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c index e544a02b7b..9cd6535d63 100644 --- a/gst/gstghostpad.c +++ b/gst/gstghostpad.c @@ -224,7 +224,7 @@ gst_proxy_pad_do_getcaps (GstPad * pad) if (target) { /* if we have a real target, proxy the call */ - res = gst_pad_get_caps_refed (target); + res = gst_pad_get_caps_reffed (target); GST_DEBUG_OBJECT (pad, "get caps of target %s:%s : %" GST_PTR_FORMAT, GST_DEBUG_PAD_NAME (target), res); diff --git a/gst/gstpad.c b/gst/gstpad.c index cf4be1cfa0..73a8246c70 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -2182,7 +2182,7 @@ done: * gst_caps_make_writable() explicitely where needed */ /** - * gst_pad_get_caps_refed: + * gst_pad_get_caps_reffed: * @pad: a #GstPad to get the capabilities of. * * Gets the capabilities this pad can produce or consume. Preferred function if @@ -2193,7 +2193,7 @@ done: * Since: 0.10.26 */ GstCaps * -gst_pad_get_caps_refed (GstPad * pad) +gst_pad_get_caps_reffed (GstPad * pad) { GstCaps *result = NULL; @@ -2228,7 +2228,7 @@ gst_pad_get_caps_refed (GstPad * pad) GstCaps * gst_pad_get_caps (GstPad * pad) { - GstCaps *result = gst_pad_get_caps_refed (pad); + GstCaps *result = gst_pad_get_caps_reffed (pad); /* be sure that we have a copy */ if (G_LIKELY (result)) @@ -2241,7 +2241,7 @@ gst_pad_get_caps (GstPad * pad) * gst_caps_make_writable() explicitely where needed */ /** - * gst_pad_peer_get_caps_refed: + * gst_pad_peer_get_caps_reffed: * @pad: a #GstPad to get the capabilities of. * * Gets the capabilities of the peer connected to this pad. Preferred function @@ -2252,7 +2252,7 @@ gst_pad_get_caps (GstPad * pad) * Since: 0.10.26 */ GstCaps * -gst_pad_peer_get_caps_refed (GstPad * pad) +gst_pad_peer_get_caps_reffed (GstPad * pad) { GstPad *peerpad; GstCaps *result = NULL; @@ -2270,7 +2270,7 @@ gst_pad_peer_get_caps_refed (GstPad * pad) gst_object_ref (peerpad); GST_OBJECT_UNLOCK (pad); - result = gst_pad_get_caps_refed (peerpad); + result = gst_pad_get_caps_reffed (peerpad); gst_object_unref (peerpad); @@ -2441,7 +2441,7 @@ gst_pad_acceptcaps_default (GstPad * pad, GstCaps * caps) GST_DEBUG_OBJECT (pad, "caps %" GST_PTR_FORMAT, caps); - allowed = gst_pad_get_caps_refed (pad); + allowed = gst_pad_get_caps_reffed (pad); if (!allowed) goto nothing_allowed; @@ -2777,9 +2777,9 @@ gst_pad_get_allowed_caps (GstPad * pad) gst_object_ref (peer); GST_OBJECT_UNLOCK (pad); - mycaps = gst_pad_get_caps_refed (pad); + mycaps = gst_pad_get_caps_reffed (pad); - peercaps = gst_pad_get_caps_refed (peer); + peercaps = gst_pad_get_caps_reffed (peer); gst_object_unref (peer); caps = gst_caps_intersect (mycaps, peercaps); diff --git a/gst/gstpad.h b/gst/gstpad.h index 835ea0aacc..c010f7045c 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -890,13 +890,13 @@ void gst_pad_set_setcaps_function (GstPad *pad, GstPadSetCapsFunction setcaps G_CONST_RETURN GstCaps* gst_pad_get_pad_template_caps (GstPad *pad); /* capsnego function for linked/unlinked pads */ -GstCaps * gst_pad_get_caps_refed (GstPad * pad); +GstCaps * gst_pad_get_caps_reffed (GstPad * pad); GstCaps * gst_pad_get_caps (GstPad * pad); void gst_pad_fixate_caps (GstPad * pad, GstCaps *caps); gboolean gst_pad_accept_caps (GstPad * pad, GstCaps *caps); gboolean gst_pad_set_caps (GstPad * pad, GstCaps *caps); -GstCaps * gst_pad_peer_get_caps_refed (GstPad * pad); +GstCaps * gst_pad_peer_get_caps_reffed (GstPad * pad); GstCaps * gst_pad_peer_get_caps (GstPad * pad); gboolean gst_pad_peer_accept_caps (GstPad * pad, GstCaps *caps); diff --git a/gst/gstutils.c b/gst/gstutils.c index 87a06a8407..e4b7c4ea0e 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -2634,7 +2634,7 @@ intersect_caps_func (GstPad * pad, GValue * ret, GstPad * orig) GstCaps *peercaps, *existing; existing = g_value_get_pointer (ret); - peercaps = gst_pad_peer_get_caps_refed (pad); + peercaps = gst_pad_peer_get_caps_reffed (pad); if (G_LIKELY (peercaps)) { g_value_set_pointer (ret, gst_caps_intersect (existing, peercaps)); gst_caps_unref (existing); diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index 5ae431e8a3..9053609a81 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -2417,7 +2417,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc) gboolean result = FALSE; /* first see what is possible on our source pad */ - thiscaps = gst_pad_get_caps_refed (GST_BASE_SRC_PAD (basesrc)); + thiscaps = gst_pad_get_caps_reffed (GST_BASE_SRC_PAD (basesrc)); GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps); /* nothing or anything is allowed, we're done */ if (thiscaps == NULL || gst_caps_is_any (thiscaps)) @@ -2427,7 +2427,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc) goto no_caps; /* get the peer caps */ - peercaps = gst_pad_peer_get_caps_refed (GST_BASE_SRC_PAD (basesrc)); + peercaps = gst_pad_peer_get_caps_reffed (GST_BASE_SRC_PAD (basesrc)); GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps); if (peercaps) { GstCaps *icaps; diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index f54d59c274..95a610aa7b 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -611,7 +611,7 @@ gst_base_transform_getcaps (GstPad * pad) otherpad = (pad == trans->srcpad) ? trans->sinkpad : trans->srcpad; /* we can do what the peer can */ - caps = gst_pad_peer_get_caps_refed (otherpad); + caps = gst_pad_peer_get_caps_reffed (otherpad); if (caps) { GstCaps *temp; const GstCaps *templ; @@ -854,7 +854,7 @@ gst_base_transform_find_transform (GstBaseTransform * trans, GstPad * pad, GST_DEBUG_OBJECT (trans, "othercaps now %" GST_PTR_FORMAT, othercaps); - peercaps = gst_pad_get_caps_refed (otherpeer); + peercaps = gst_pad_get_caps_reffed (otherpeer); intersect = gst_caps_intersect (peercaps, othercaps); gst_caps_unref (peercaps); gst_caps_unref (othercaps); @@ -1000,7 +1000,7 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps) GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps); /* get all the formats we can handle on this pad */ - allowed = gst_pad_get_caps_refed (pad); + allowed = gst_pad_get_caps_reffed (pad); if (!allowed) { GST_DEBUG_OBJECT (pad, "gst_pad_get_caps() failed"); goto no_transform_possible; diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index 869b22777f..7156163c2f 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -587,7 +587,7 @@ EXPORTS gst_pad_flags_get_type gst_pad_get_allowed_caps gst_pad_get_caps - gst_pad_get_caps_refed + gst_pad_get_caps_reffed gst_pad_get_direction gst_pad_get_element_private gst_pad_get_fixed_caps_func @@ -617,7 +617,7 @@ EXPORTS gst_pad_pause_task gst_pad_peer_accept_caps gst_pad_peer_get_caps - gst_pad_peer_get_caps_refed + gst_pad_peer_get_caps_reffed gst_pad_peer_query gst_pad_presence_get_type gst_pad_proxy_getcaps