gst-plugins-bad: interlace: fix caps leaks

Vincent Penquerc'h vincent at kemper.freedesktop.org
Tue Jan 10 05:25:44 PST 2012


Module: gst-plugins-bad
Branch: master
Commit: 6cf84a0348d49e2906451b251d1e09387b1199a6
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=6cf84a0348d49e2906451b251d1e09387b1199a6

Author: Vincent Penquerc'h <vincent.penquerch at collabora.co.uk>
Date:   Tue Jan 10 13:25:05 2012 +0000

interlace: fix caps leaks

---

 gst/interlace/gstinterlace.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/gst/interlace/gstinterlace.c b/gst/interlace/gstinterlace.c
index 4e224be..96455f1 100644
--- a/gst/interlace/gstinterlace.c
+++ b/gst/interlace/gstinterlace.c
@@ -187,6 +187,7 @@ static gboolean gst_interlace_setcaps (GstPad * pad, GstCaps * caps);
 static GstCaps *gst_interlace_getcaps (GstPad * pad);
 static GstStateChangeReturn gst_interlace_change_state (GstElement * element,
     GstStateChange transition);
+static void gst_interlace_finalize (GObject * obj);
 
 static GstElementClass *parent_class = NULL;
 
@@ -242,6 +243,7 @@ gst_interlace_class_init (GstInterlaceClass * klass)
 
   object_class->set_property = gst_interlace_set_property;
   object_class->get_property = gst_interlace_get_property;
+  object_class->finalize = gst_interlace_finalize;
 
   element_class->change_state = gst_interlace_change_state;
 
@@ -269,6 +271,16 @@ gst_interlace_class_init (GstInterlaceClass * klass)
 }
 
 static void
+gst_interlace_finalize (GObject * obj)
+{
+  GstInterlace *interlace = GST_INTERLACE (obj);
+
+  gst_caps_replace (&interlace->srccaps, NULL);
+
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+static void
 gst_interlace_reset (GstInterlace * interlace)
 {
   interlace->phase_index = interlace->pattern_offset;
@@ -478,7 +490,7 @@ gst_interlace_setcaps (GstPad * pad, GstCaps * caps)
   gboolean interlaced = TRUE;
   int fps_n, fps_d;
   GstPad *otherpad;
-  GstCaps *othercaps;
+  GstCaps *othercaps = NULL;
   const PulldownFormat *pdformat;
 
   interlace = GST_INTERLACE (gst_pad_get_parent (pad));
@@ -527,6 +539,8 @@ gst_interlace_setcaps (GstPad * pad, GstCaps * caps)
   }
 
 error:
+  if (othercaps)
+    gst_caps_unref (othercaps);
   g_object_unref (interlace);
 
   return ret;



More information about the gstreamer-commits mailing list