From c7fd90c842184a58fe2b974d49724c84461f47d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 4 Aug 2012 16:13:36 +0100 Subject: [PATCH] gst_tag_list_free -> gst_tag_list_unref --- ext/a52dec/gsta52dec.c | 2 +- ext/lame/gstlamemp3enc.c | 6 +++--- gst/asfdemux/gstasfdemux.c | 12 ++++++------ gst/realmedia/rademux.c | 2 +- gst/realmedia/rmdemux.c | 4 ++-- gst/realmedia/rmutils.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index dfcb480..9693e13 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -460,7 +460,7 @@ gst_a52dec_update_streaminfo (GstA52Dec * a52dec) gst_audio_decoder_merge_tags (GST_AUDIO_DECODER (a52dec), taglist, GST_TAG_MERGE_REPLACE); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); } static GstFlowReturn diff --git a/ext/lame/gstlamemp3enc.c b/ext/lame/gstlamemp3enc.c index c2b0871..4955495 100644 --- a/ext/lame/gstlamemp3enc.c +++ b/ext/lame/gstlamemp3enc.c @@ -375,7 +375,7 @@ gst_lamemp3enc_set_format (GstAudioEncoder * enc, GstAudioInfo * info) if (tags) { gst_audio_encoder_merge_tags (enc, tags, GST_TAG_MERGE_REPLACE); - gst_tag_list_free (tags); + gst_tag_list_unref (tags); } return TRUE; @@ -383,7 +383,7 @@ gst_lamemp3enc_set_format (GstAudioEncoder * enc, GstAudioInfo * info) zero_output_rate: { if (tags) - gst_tag_list_free (tags); + gst_tag_list_unref (tags); GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS, (NULL), ("LAME mp3 audio decided on a zero sample rate")); return FALSE; @@ -819,7 +819,7 @@ gst_lamemp3enc_setup (GstLameMP3Enc * lame, GstTagList ** tags) if ((command) < 0) { \ GST_ERROR_OBJECT (lame, "setup failed: " G_STRINGIFY (command)); \ if (*tags) { \ - gst_tag_list_free (*tags); \ + gst_tag_list_unref (*tags); \ *tags = NULL; \ } \ return FALSE; \ diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 6957c61..a06ed34 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -143,7 +143,7 @@ gst_asf_demux_free_stream (GstASFDemux * demux, AsfStream * stream) { gst_caps_replace (&stream->caps, NULL); if (stream->pending_tags) { - gst_tag_list_free (stream->pending_tags); + gst_tag_list_unref (stream->pending_tags); stream->pending_tags = NULL; } if (stream->pad) { @@ -186,7 +186,7 @@ gst_asf_demux_reset (GstASFDemux * demux, gboolean chain_reset) demux->adapter = NULL; } if (demux->taglist) { - gst_tag_list_free (demux->taglist); + gst_tag_list_unref (demux->taglist); demux->taglist = NULL; } if (demux->metadata) { @@ -2583,15 +2583,15 @@ gst_asf_demux_add_global_tags (GstASFDemux * demux, GstTagList * taglist) return; if (gst_tag_list_is_empty (taglist)) { - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); return; } t = gst_tag_list_merge (demux->taglist, taglist, GST_TAG_MERGE_APPEND); gst_tag_list_set_scope (t, GST_TAG_SCOPE_GLOBAL); if (demux->taglist) - gst_tag_list_free (demux->taglist); - gst_tag_list_free (taglist); + gst_tag_list_unref (demux->taglist); + gst_tag_list_unref (taglist); demux->taglist = t; GST_LOG_OBJECT (demux, "global tags now: %" GST_PTR_FORMAT, demux->taglist); } @@ -2849,7 +2849,7 @@ gst_asf_demux_process_ext_content_desc (GstASFDemux * demux, guint8 * data, not_enough_data: { GST_WARNING ("Unexpected end of data parsing ext content desc object"); - gst_tag_list_free (taglist); + gst_tag_list_unref (taglist); return GST_FLOW_OK; /* not really fatal */ } } diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c index 63ca696..232d44f 100644 --- a/gst/realmedia/rademux.c +++ b/gst/realmedia/rademux.c @@ -127,7 +127,7 @@ gst_real_audio_demux_reset (GstRealAudioDemux * demux) } if (demux->pending_tags) { - gst_tag_list_free (demux->pending_tags); + gst_tag_list_unref (demux->pending_tags); demux->pending_tags = NULL; } diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index 2e85be0a..6fef310 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -669,7 +669,7 @@ gst_rmdemux_reset (GstRMDemux * rmdemux) gst_rmdemux_stream_clear_cached_subpackets (rmdemux, stream); gst_element_remove_pad (GST_ELEMENT (rmdemux), stream->pad); if (stream->pending_tags) - gst_tag_list_free (stream->pending_tags); + gst_tag_list_unref (stream->pending_tags); if (stream->subpackets) g_ptr_array_free (stream->subpackets, TRUE); g_free (stream->index); @@ -681,7 +681,7 @@ gst_rmdemux_reset (GstRMDemux * rmdemux) rmdemux->n_video_streams = 0; if (rmdemux->pending_tags != NULL) { - gst_tag_list_free (rmdemux->pending_tags); + gst_tag_list_unref (rmdemux->pending_tags); rmdemux->pending_tags = NULL; } diff --git a/gst/realmedia/rmutils.c b/gst/realmedia/rmutils.c index 3232ee8..34671ce 100644 --- a/gst/realmedia/rmutils.c +++ b/gst/realmedia/rmutils.c @@ -118,7 +118,7 @@ gst_rm_utils_read_tags (const guint8 * data, guint datalen, if (gst_tag_list_n_tags (tags) > 0) return tags; - gst_tag_list_free (tags); + gst_tag_list_unref (tags); return NULL; } -- 2.7.4