From ede1e01d13f1781439bf69c78e33e0345ef67e54 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 21 Nov 2008 16:48:48 +0000 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ gst/gstpad.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 36cb7a5a45..3dd9ee97c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-21 Wim Taymans + + * gst/gstpad.c: (gst_pad_accept_caps): + Avoid getting the acceptcaps function too early. + 2008-11-21 Wim Taymans * tools/gst-launch.c: (event_loop): diff --git a/gst/gstpad.c b/gst/gstpad.c index 57f6b679cd..c4b6ee82ec 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -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)) {