From a2dbc1182cf6b170507b9578eaba097a921d620a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 14 Aug 2007 14:56:20 +0000 Subject: gst/flv/gstflvdemux.c: Fix locking and refcounting on the index. Original commit message from CVS: * gst/flv/gstflvdemux.c: (gst_flv_demux_set_index), (gst_flv_demux_get_index): Fix locking and refcounting on the index. --- ChangeLog | 6 ++++++ gst/flv/gstflvdemux.c | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 65532099..5402d205 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-14 Wim Taymans + + * gst/flv/gstflvdemux.c: (gst_flv_demux_set_index), + (gst_flv_demux_get_index): + Fix locking and refcounting on the index. + 2007-08-14 Julien MOUTTE * gst/flv/gstflvdemux.c: (gst_flv_demux_cleanup), diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 339fc0d7..3f727f1c 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -911,7 +911,11 @@ gst_flv_demux_set_index (GstElement * element, GstIndex * index) { GstFLVDemux *demux = GST_FLV_DEMUX (element); + GST_OBJECT_LOCK (demux); + if (demux->index) + gst_object_unref (demux->index); demux->index = gst_object_ref (index); + GST_OBJECT_UNLOCK (demux); gst_index_get_writer_id (index, GST_OBJECT (element), &demux->index_id); } @@ -919,9 +923,16 @@ gst_flv_demux_set_index (GstElement * element, GstIndex * index) static GstIndex * gst_flv_demux_get_index (GstElement * element) { + GstIndex *result = NULL; + GstFLVDemux *demux = GST_FLV_DEMUX (element); - return demux->index; + GST_OBJECT_LOCK (demux); + if (demux->index) + result = gst_object_ref (demux->index); + GST_OBJECT_UNLOCK (demux); + + return result; } static void -- cgit v1.2.1