From 7a118610ed79903a7b709500cf6074814e0db48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Fri, 13 Jun 2008 21:13:46 +0000
Subject: [PATCH] gst/debug/gsttaginject.c: Don't unref NULL taglist in
 finalize. Don't use c++ style comments.

Original commit message from CVS:
* gst/debug/gsttaginject.c: (gst_tag_inject_finalize),
(gst_tag_inject_class_init), (gst_tag_inject_init):
Don't unref NULL taglist in finalize. Don't use c++ style
comments.
---
 ChangeLog                |  7 +++++++
 gst/debug/gsttaginject.c | 18 +++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77cd4e2ed6..f5b4acf92b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-13  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* gst/debug/gsttaginject.c: (gst_tag_inject_finalize),
+	  (gst_tag_inject_class_init), (gst_tag_inject_init):
+	  Don't unref NULL taglist in finalize. Don't use c++ style
+	  comments.
+
 2008-06-13  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/matroska/matroska-demux.c:
diff --git a/gst/debug/gsttaginject.c b/gst/debug/gsttaginject.c
index 2901d4a73b..aee1227ff6 100644
--- a/gst/debug/gsttaginject.c
+++ b/gst/debug/gsttaginject.c
@@ -51,7 +51,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_tag_inject_debug);
 
 enum
 {
-  PROP_TAGS = 1,
+  PROP_TAGS = 1
 };
 
 
@@ -67,8 +67,8 @@ static void gst_tag_inject_set_property (GObject * object, guint prop_id,
 static void gst_tag_inject_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-//static GstFlowReturn gst_tag_inject_transform_ip (GstBaseTransform * trans,
-//    GstBuffer * buf);
+/*static GstFlowReturn gst_tag_inject_transform_ip (GstBaseTransform * trans,
+    GstBuffer * buf); */
 static gboolean gst_tag_inject_start (GstBaseTransform * trans);
 
 
@@ -91,7 +91,10 @@ gst_tag_inject_finalize (GObject * object)
 {
   GstTagInject *self = GST_TAG_INJECT (object);
 
-  gst_tag_list_free (self->tags);
+  if (self->tags) {
+    gst_tag_list_free (self->tags);
+    self->tags = NULL;
+  }
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -117,8 +120,9 @@ gst_tag_inject_class_init (GstTagInjectClass * klass)
 
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_tag_inject_finalize);
 
-  //gstbasetrans_class->transform_ip =
-  //    GST_DEBUG_FUNCPTR (gst_tag_inject_transform_ip);
+  /*gstbasetrans_class->transform_ip =
+     GST_DEBUG_FUNCPTR (gst_tag_inject_transform_ip); */
+
   gstbasetrans_class->start = GST_DEBUG_FUNCPTR (gst_tag_inject_start);
 }
 
@@ -132,7 +136,7 @@ gst_tag_inject_init (GstTagInject * self, GstTagInjectClass * g_class)
 static GstFlowReturn
 gst_tag_inject_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
 {
-  //GstTagInject *self = GST_TAG_INJECT (trans);
+  GstTagInject *self = GST_TAG_INJECT (trans);
 
   return GST_FLOW_OK;
 }