From 7bccbfdd48c96497a7c83a2cb6ea25724e319a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 19 Apr 2011 15:24:03 +0100 Subject: [PATCH] mpeg2dec: don't deadlock when setting an index --- ext/mpeg2dec/gstmpeg2dec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index 5867462e55..3f7474611f 100644 --- 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 *