From cd3875857e8f3f4ced1ad598e780a85c9dc81108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 28 May 2012 00:08:18 +0100 Subject: [PATCH] gst_tag_list_free() -> gst_tag_list_unref() --- gst/gsttagsetter.c | 4 ++-- gst/gsttoc.c | 12 ++++++------ plugins/elements/gstinputselector.c | 6 +++--- tools/gst-launch.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gst/gsttagsetter.c b/gst/gsttagsetter.c index 2ed099df68..b538c59b4c 100644 --- a/gst/gsttagsetter.c +++ b/gst/gsttagsetter.c @@ -126,7 +126,7 @@ gst_tag_data_free (gpointer p) GstTagData *data = (GstTagData *) p; if (data->list) - gst_tag_list_free (data->list); + gst_tag_list_unref (data->list); g_mutex_clear (&data->lock); @@ -181,7 +181,7 @@ gst_tag_setter_reset_tags (GstTagSetter * setter) GST_TAG_DATA_LOCK (data); if (data->list) { - gst_tag_list_free (data->list); + gst_tag_list_unref (data->list); data->list = NULL; } GST_TAG_DATA_UNLOCK (data); diff --git a/gst/gsttoc.c b/gst/gsttoc.c index 44f3b0ad34..b79717bac6 100644 --- a/gst/gsttoc.c +++ b/gst/gsttoc.c @@ -175,7 +175,7 @@ gst_toc_free (GstToc * toc) g_list_free (toc->entries); if (toc->tags != NULL) - gst_tag_list_free (toc->tags); + gst_tag_list_unref (toc->tags); if (toc->info != NULL) gst_structure_free (toc->info); @@ -206,7 +206,7 @@ gst_toc_entry_free (GstTocEntry * entry) g_free (entry->uid); if (entry->tags != NULL) - gst_tag_list_free (entry->tags); + gst_tag_list_unref (entry->tags); if (entry->info != NULL) gst_structure_free (entry->info); @@ -372,7 +372,7 @@ gst_toc_entry_from_structure (const GstStructure * entry, guint level) if (G_LIKELY (GST_IS_TAG_LIST (g_value_get_boxed (val)))) { list = gst_tag_list_copy (GST_TAG_LIST (g_value_get_boxed (val))); - gst_tag_list_free (ret->tags); + gst_tag_list_unref (ret->tags); ret->tags = list; } } @@ -456,7 +456,7 @@ __gst_toc_from_structure (const GstStructure * toc) if (G_LIKELY (GST_IS_TAG_LIST (g_value_get_boxed (val)))) { list = gst_tag_list_copy (GST_TAG_LIST (g_value_get_boxed (val))); - gst_tag_list_free (ret->tags); + gst_tag_list_unref (ret->tags); ret->tags = list; } } @@ -712,7 +712,7 @@ gst_toc_entry_copy (const GstTocEntry * entry) if (GST_IS_TAG_LIST (entry->tags)) { list = gst_tag_list_copy (entry->tags); - gst_tag_list_free (ret->tags); + gst_tag_list_unref (ret->tags); ret->tags = list; } @@ -770,7 +770,7 @@ gst_toc_copy (const GstToc * toc) if (GST_IS_TAG_LIST (toc->tags)) { list = gst_tag_list_copy (toc->tags); - gst_tag_list_free (ret->tags); + gst_tag_list_unref (ret->tags); ret->tags = list; } diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index eb6fba5cb7..62a5aaa16a 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -220,7 +220,7 @@ gst_selector_pad_finalize (GObject * object) pad = GST_SELECTOR_PAD_CAST (object); if (pad->tags) - gst_tag_list_free (pad->tags); + gst_tag_list_unref (pad->tags); G_OBJECT_CLASS (gst_selector_pad_parent_class)->finalize (object); } @@ -417,7 +417,7 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event) newtags = gst_tag_list_merge (oldtags, tags, GST_TAG_MERGE_REPLACE); selpad->tags = newtags; if (oldtags) - gst_tag_list_free (oldtags); + gst_tag_list_unref (oldtags); GST_DEBUG_OBJECT (pad, "received tags %" GST_PTR_FORMAT, newtags); GST_OBJECT_UNLOCK (selpad); @@ -1270,7 +1270,7 @@ gst_input_selector_reset (GstInputSelector * sel) gst_selector_pad_reset (selpad); if (selpad->tags) { - gst_tag_list_free (selpad->tags); + gst_tag_list_unref (selpad->tags); selpad->tags = NULL; } } diff --git a/tools/gst-launch.c b/tools/gst-launch.c index 474dce590f..4abb429e9c 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -663,7 +663,7 @@ event_loop (GstElement * pipeline, gboolean blocking, GstState target_state) gst_message_parse_tag (message, &tag_list); gst_tag_list_foreach (tag_list, print_tag, NULL); - gst_tag_list_free (tag_list); + gst_tag_list_unref (tag_list); } break; case GST_MESSAGE_TOC: