From b4ac5eabc9565023b85763b16581867dc504a7ae Mon Sep 17 00:00:00 2001
From: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date: Mon, 28 Apr 2008 23:49:48 +0000
Subject: [MOVED FROM GST-P-FARSIGHT] Fix object locking in setcaps

20080428234948-4f0f6-4586434b4308e114f495e926996fc19483c1056f.gz
---
 gst/liveadder/liveadder.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gst')

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;
   }
-- 
cgit v1.2.1