[gst-cvs] gst-plugins-bad: GstAdapter is not a GstObject and should be freed with g_object_unref()
Tim Mueller
tpm at kemper.freedesktop.org
Mon Aug 31 05:34:26 PDT 2009
Module: gst-plugins-bad
Branch: master
Commit: 10d67eda7a2efff834e67b6c34a092494005a1b0
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=10d67eda7a2efff834e67b6c34a092494005a1b0
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Mon Aug 31 13:14:02 2009 +0100
GstAdapter is not a GstObject and should be freed with g_object_unref()
---
ext/gme/gstgme.c | 2 +-
ext/metadata/gstbasemetadata.c | 4 ++--
ext/metadata/metadata.c | 6 +++---
ext/mplex/gstmplex.cc | 2 +-
ext/rsvg/gstrsvgdec.c | 2 +-
gst/aiffparse/aiffparse.c | 2 +-
gst/mpegtsmux/mpegtsmux.c | 2 +-
gst/mpegvideoparse/mpegpacketiser.c | 2 +-
gst/mxf/mxfmux.c | 4 ++--
gst/nuvdemux/gstnuvdemux.c | 5 +++--
10 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c
index e3f145c..2d7b2a5 100644
--- a/ext/gme/gstgme.c
+++ b/ext/gme/gstgme.c
@@ -171,7 +171,7 @@ gst_gme_dec_dispose (GObject * object)
GstGmeDec *gme = GST_GME_DEC (object);
if (gme->adapter) {
- gst_object_unref (gme->adapter);
+ g_object_unref (gme->adapter);
gme->adapter = NULL;
}
}
diff --git a/ext/metadata/gstbasemetadata.c b/ext/metadata/gstbasemetadata.c
index dd91b2a..0d7f3d6 100644
--- a/ext/metadata/gstbasemetadata.c
+++ b/ext/metadata/gstbasemetadata.c
@@ -306,12 +306,12 @@ gst_base_metadata_dispose_members (GstBaseMetadata * filter)
/* adapter used during parsing process */
if (filter->adapter_parsing) {
- gst_object_unref (filter->adapter_parsing);
+ g_object_unref (filter->adapter_parsing);
filter->adapter_parsing = NULL;
}
if (filter->adapter_holding) {
- gst_object_unref (filter->adapter_holding);
+ g_object_unref (filter->adapter_holding);
filter->adapter_holding = NULL;
}
diff --git a/ext/metadata/metadata.c b/ext/metadata/metadata.c
index 9129374..fd51530 100644
--- a/ext/metadata/metadata.c
+++ b/ext/metadata/metadata.c
@@ -177,17 +177,17 @@ metadata_dispose (MetaData ** meta_data)
metadata_chunk_array_free (&(*meta_data)->inject_chunks);
if ((*meta_data)->xmp_adapter) {
- gst_object_unref ((*meta_data)->xmp_adapter);
+ g_object_unref ((*meta_data)->xmp_adapter);
(*meta_data)->xmp_adapter = NULL;
}
if ((*meta_data)->iptc_adapter) {
- gst_object_unref ((*meta_data)->iptc_adapter);
+ g_object_unref ((*meta_data)->iptc_adapter);
(*meta_data)->iptc_adapter = NULL;
}
if ((*meta_data)->exif_adapter) {
- gst_object_unref ((*meta_data)->exif_adapter);
+ g_object_unref ((*meta_data)->exif_adapter);
(*meta_data)->exif_adapter = NULL;
}
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index ae08e2e..677db8d 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -238,7 +238,7 @@ gst_mplex_reset (GstMplex * mplex)
if (!mpad->pad) {
g_cond_free (mpad->cond);
- gst_object_unref (mpad->adapter);
+ g_object_unref (mpad->adapter);
g_free (mpad);
} else
nlist = g_slist_append (nlist, mpad);
diff --git a/ext/rsvg/gstrsvgdec.c b/ext/rsvg/gstrsvgdec.c
index 875bb62..8ddb2aa 100644
--- a/ext/rsvg/gstrsvgdec.c
+++ b/ext/rsvg/gstrsvgdec.c
@@ -114,7 +114,7 @@ gst_rsvg_dec_finalize (GObject * object)
GstRsvgDec *rsvg = GST_RSVG_DEC (object);
if (rsvg->adapter) {
- gst_object_unref (rsvg->adapter);
+ g_object_unref (rsvg->adapter);
rsvg->adapter = NULL;
}
diff --git a/gst/aiffparse/aiffparse.c b/gst/aiffparse/aiffparse.c
index c45008b..b2ad950 100644
--- a/gst/aiffparse/aiffparse.c
+++ b/gst/aiffparse/aiffparse.c
@@ -1516,7 +1516,7 @@ gst_aiffparse_sink_activate (GstPad * sinkpad)
gboolean res;
if (aiff->adapter)
- gst_object_unref (aiff->adapter);
+ g_object_unref (aiff->adapter);
if (gst_pad_check_pull_range (sinkpad)) {
GST_DEBUG ("going to pull mode");
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index 6b9b632..4ad22e7 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -227,7 +227,7 @@ mpegtsmux_dispose (GObject * object)
if (mux->adapter) {
gst_adapter_clear (mux->adapter);
- gst_object_unref (mux->adapter);
+ g_object_unref (mux->adapter);
mux->adapter = NULL;
}
if (mux->collect) {
diff --git a/gst/mpegvideoparse/mpegpacketiser.c b/gst/mpegvideoparse/mpegpacketiser.c
index 0312680..90c13c6 100644
--- a/gst/mpegvideoparse/mpegpacketiser.c
+++ b/gst/mpegvideoparse/mpegpacketiser.c
@@ -45,7 +45,7 @@ mpeg_packetiser_init (MPEGPacketiser * p)
void
mpeg_packetiser_free (MPEGPacketiser * p)
{
- gst_object_unref (p->adapter);
+ g_object_unref (p->adapter);
g_free (p->blocks);
}
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c
index fdc1bc6..757d269 100644
--- a/gst/mxf/mxfmux.c
+++ b/gst/mxf/mxfmux.c
@@ -206,7 +206,7 @@ gst_mxf_mux_reset (GstMXFMux * mux)
while ((sl = mux->collect->data) != NULL) {
GstMXFMuxPad *cpad = (GstMXFMuxPad *) sl->data;
- gst_object_unref (cpad->adapter);
+ g_object_unref (cpad->adapter);
g_free (cpad->mapping_data);
gst_collect_pads_remove_pad (mux->collect, cpad->collect.pad);
@@ -432,7 +432,7 @@ gst_mxf_mux_release_pad (GstElement * element, GstPad * pad)
/*GstMXFMux *mux = GST_MXF_MUX (GST_PAD_PARENT (pad));
GstMXFMuxPad *cpad = (GstMXFMuxPad *) gst_pad_get_element_private (pad);
- gst_object_unref (cpad->adapter);
+ g_object_unref (cpad->adapter);
g_free (cpad->mapping_data);
gst_collect_pads_remove_pad (mux->collect, pad);
diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c
index 27fa396..bb2e532 100644
--- a/gst/nuvdemux/gstnuvdemux.c
+++ b/gst/nuvdemux/gstnuvdemux.c
@@ -191,7 +191,8 @@ gst_nuv_demux_finalize (GObject * object)
gst_nuv_demux_destoy_src_pad (nuv);
gst_nuv_demux_reset (nuv);
if (nuv->adapter != NULL) {
- gst_object_unref (nuv->adapter);
+ g_object_unref (nuv->adapter);
+ nuv->adapter = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -800,7 +801,7 @@ gst_nuv_demux_sink_activate (GstPad * sinkpad)
if (gst_pad_check_pull_range (sinkpad)) {
nuv->mode = 0;
if (nuv->adapter != NULL) {
- gst_object_unref (nuv->adapter);
+ g_object_unref (nuv->adapter);
nuv->adapter = NULL;
}
res = gst_pad_activate_pull (sinkpad, TRUE);
More information about the Gstreamer-commits
mailing list