diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-08-31 11:32:39 +0100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-08-31 12:10:05 +0100 |
| commit | 3f69f8d3ee0ea812ba73e66a6d16e5d0a7e536b9 (patch) | |
| tree | fe1af05211d073f9062dfb355f8810ec92053ce5 | |
| parent | a26a2a9ff535895cb48ae788266e918c13788b81 (diff) | |
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.
| -rw-r--r-- | gst/flv/gstflvdemux.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 59a12d036..1f7000208 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 * |