mpeg2dec: don't deadlock when setting an index

diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index 5867462e55dc06cc5f9ba5a5c646e5747f605ee0..3f7474611fe323583b2407bc1eb0a4f4452923d8 100644 (file)
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -299,10 +299,11 @@ gst_mpeg2dec_set_index (GstElement * element, GstIndex * index)
   mpeg2dec->index_id = 0;
   if (index) {
     mpeg2dec->index = gst_object_ref (index);
-    gst_index_get_writer_id (index, GST_OBJECT (element), &mpeg2dec->index_id);
   }
-
   GST_OBJECT_UNLOCK (mpeg2dec);
+  /* object lock might be taken again */
+  if (index)
+    gst_index_get_writer_id (index, GST_OBJECT (element), &mpeg2dec->index_id);
 }
 
 static GstIndex *