mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-02 12:32:29 +00:00
gst/gstpad.c: Avoid getting the acceptcaps function too early.
Original commit message from CVS: * gst/gstpad.c: (gst_pad_accept_caps): Avoid getting the acceptcaps function too early.
This commit is contained in:
parent
d135413712
commit
ede1e01d13
2 changed files with 6 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-11-21 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||
|
||||
* gst/gstpad.c: (gst_pad_accept_caps):
|
||||
Avoid getting the acceptcaps function too early.
|
||||
|
||||
2008-11-21 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||
|
||||
* tools/gst-launch.c: (event_loop):
|
||||
|
|
|
@ -2311,13 +2311,13 @@ gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
|
|||
|
||||
/* lock for checking the existing caps */
|
||||
GST_OBJECT_LOCK (pad);
|
||||
acceptfunc = GST_PAD_ACCEPTCAPSFUNC (pad);
|
||||
GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad, "accept caps of %p", caps);
|
||||
/* The current caps on a pad are trivially acceptable */
|
||||
if (G_LIKELY ((existing = GST_PAD_CAPS (pad)))) {
|
||||
if (caps == existing || gst_caps_is_equal (caps, existing))
|
||||
goto is_same_caps;
|
||||
}
|
||||
acceptfunc = GST_PAD_ACCEPTCAPSFUNC (pad);
|
||||
GST_OBJECT_UNLOCK (pad);
|
||||
|
||||
if (G_LIKELY (acceptfunc)) {
|
||||
|
|
Loading…
Reference in a new issue