From 3f69f8d3ee0ea812ba73e66a6d16e5d0a7e536b9 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 31 Aug 2009 11:32:39 +0100 Subject: flvdemux: Fix tests warning from setting a NULL index Setting a null index in the tests was causing warnings by unreffing NULL pointers. This is a bug exposed by a recent change in core, it seems. --- gst/flv/gstflvdemux.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gst/flv') diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 59a12d03..1f700020 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -1183,11 +1183,14 @@ gst_flv_demux_set_index (GstElement * element, GstIndex * index) GST_OBJECT_LOCK (demux); if (demux->index) gst_object_unref (demux->index); - demux->index = gst_object_ref (index); - GST_OBJECT_UNLOCK (demux); + if (index) { + demux->index = gst_object_ref (index); + gst_index_get_writer_id (index, GST_OBJECT (element), &demux->index_id); + demux->own_index = FALSE; + } else + demux->index = NULL; - gst_index_get_writer_id (index, GST_OBJECT (element), &demux->index_id); - demux->own_index = FALSE; + GST_OBJECT_UNLOCK (demux); } static GstIndex * -- cgit