summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-09-24 10:53:36 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-09-24 10:53:36 +0000
commita67ced8ff7e6a22c9db554e141648f5a7991a96b (patch)
tree67553531d6164adbb326cbe8a540b4c0b84a1b16
parentdedf80a378fa091f511a2fdd5484888e7a4dcb04 (diff)
Massive leak fixing, plus code cleanups.
Original commit message from CVS: * ext/audioresample/gstaudioresample.c: * ext/x264/gstx264enc.c: * gst/dvdspu/gstdvdspu.c: * gst/dvdspu/gstdvdspu.h: * gst/festival/gstfestival.c: * gst/h264parse/gsth264parse.c: * gst/mpegtsparse/mpegtspacketizer.c: * gst/mpegtsparse/mpegtsparse.c: * gst/multifile/gstmultifilesink.c: * gst/multifile/gstmultifilesrc.c: * gst/nuvdemux/gstnuvdemux.c: * sys/dshowsrcwrapper/gstdshowaudiosrc.c: * sys/dshowsrcwrapper/gstdshowvideosrc.c: * sys/vcd/vcdsrc.c: Massive leak fixing, plus code cleanups.
-rw-r--r--gst/multifile/gstmultifilesink.c4
-rw-r--r--gst/multifile/gstmultifilesrc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/gst/multifile/gstmultifilesink.c b/gst/multifile/gstmultifilesink.c
index 58977817..9280f1f5 100644
--- a/gst/multifile/gstmultifilesink.c
+++ b/gst/multifile/gstmultifilesink.c
@@ -142,10 +142,10 @@ gst_multi_file_sink_dispose (GObject * object)
{
GstMultiFileSink *sink = GST_MULTI_FILE_SINK (object);
- G_OBJECT_CLASS (parent_class)->dispose (object);
-
g_free (sink->filename);
sink->filename = NULL;
+
+ G_OBJECT_CLASS (parent_class)->dispose (object);
}
static gboolean
diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c
index 43e449d5..57d02c67 100644
--- a/gst/multifile/gstmultifilesrc.c
+++ b/gst/multifile/gstmultifilesrc.c
@@ -147,12 +147,12 @@ gst_multi_file_src_dispose (GObject * object)
{
GstMultiFileSrc *src = GST_MULTI_FILE_SRC (object);
- G_OBJECT_CLASS (parent_class)->dispose (object);
-
g_free (src->filename);
src->filename = NULL;
if (src->caps)
gst_caps_unref (src->caps);
+
+ G_OBJECT_CLASS (parent_class)->dispose (object);
}
static GstCaps *