mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstpad.c: Avoid getting the acceptcaps function too early.

Browse source 
Original commit message from CVS:
* gst/gstpad.c: (gst_pad_accept_caps):
Avoid getting the acceptcaps function too early.
This commit is contained in:
Wim Taymans 2008-11-21 16:48:48 +00:00
parent d135413712
commit ede1e01d13
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2008-11-21 Wim Taymans <wim.taymans@collabora.co.uk>
* tools/gst-launch.c: (event_loop): * tools/gst-launch.c: (event_loop):

2
gst/gstpad.c
View file

@ -2311,13 +2311,13 @@ gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
/* lock for checking the existing caps */ /* lock for checking the existing caps */
GST_OBJECT_LOCK (pad); GST_OBJECT_LOCK (pad);
acceptfunc = GST_PAD_ACCEPTCAPSFUNC (pad);
GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad, "accept caps of %p", caps); GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad, "accept caps of %p", caps);
/* The current caps on a pad are trivially acceptable */ /* The current caps on a pad are trivially acceptable */
if (G_LIKELY ((existing = GST_PAD_CAPS (pad)))) { if (G_LIKELY ((existing = GST_PAD_CAPS (pad)))) {
if (caps == existing || gst_caps_is_equal (caps, existing)) if (caps == existing || gst_caps_is_equal (caps, existing))
goto is_same_caps; goto is_same_caps;
} }
acceptfunc = GST_PAD_ACCEPTCAPSFUNC (pad);
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (G_LIKELY (acceptfunc)) { if (G_LIKELY (acceptfunc)) {