summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2008-04-28 23:49:48 +0000
committerEdward Hervey <bilboed@bilboed.com>2009-02-17 19:29:04 +0100
commitb4ac5eabc9565023b85763b16581867dc504a7ae (patch)
tree705f6f0d816141b2c60c9c87534796e56e119e92 /gst
parent806f8e05c663c19e6286f78dcfe8e5b94233679d (diff)
downloadgst-plugins-bad-b4ac5eabc9565023b85763b16581867dc504a7ae.tar.gz
gst-plugins-bad-b4ac5eabc9565023b85763b16581867dc504a7ae.tar.bz2
gst-plugins-bad-b4ac5eabc9565023b85763b16581867dc504a7ae.zip
[MOVED FROM GST-P-FARSIGHT] Fix object locking in setcaps
20080428234948-4f0f6-4586434b4308e114f495e926996fc19483c1056f.gz
Diffstat (limited to 'gst')
-rw-r--r--gst/liveadder/liveadder.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c
index 1a9b633e..4cd7537a 100644
--- a/gst/liveadder/liveadder.c
+++ b/gst/liveadder/liveadder.c
@@ -359,7 +359,6 @@ gst_live_adder_setcaps (GstPad * pad, GstCaps * caps)
pads = g_list_next (pads);
}
- GST_OBJECT_UNLOCK (adder);
/* parse caps now */
structure = gst_caps_get_structure (caps, 0);
@@ -415,11 +414,13 @@ gst_live_adder_setcaps (GstPad * pad, GstCaps * caps)
/* precalc bps */
adder->bps = (adder->width / 8) * adder->channels;
+ GST_OBJECT_UNLOCK (adder);
return TRUE;
/* ERRORS */
not_supported:
{
+ GST_OBJECT_UNLOCK (adder);
GST_DEBUG_OBJECT (adder, "unsupported format set as caps");
return FALSE;
}