From 6693a22875fbe078dcb4b10a8fd7f9fd25adddd6 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 4 Sep 2012 12:35:53 +0200
Subject: [PATCH] videobalance: avoid deadlock

_update_properties takes the object lock and should not be called when the
object lock is already taken.
---
 gst/videofilter/gstvideobalance.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c
index 4653b24cf4..9e0c9afb34 100644
--- a/gst/videofilter/gstvideobalance.c
+++ b/gst/videofilter/gstvideobalance.c
@@ -601,10 +601,10 @@ gst_video_balance_colorbalance_set_value (GstColorBalance * balance,
     changed = new_val != vb->contrast;
     vb->contrast = new_val;
   }
+  GST_OBJECT_UNLOCK (vb);
 
   if (changed)
     gst_video_balance_update_properties (vb);
-  GST_OBJECT_UNLOCK (vb);
 
   if (changed) {
     gst_color_balance_value_changed (balance, channel,