From: Wim Taymans <wim.taymans@gmail.com>
Date: Wed, 16 Nov 2005 19:08:54 +0000 (+0000)
Subject: check/elements/matroskamux.c: Fix leak in check.
X-Git-Tag: RELEASE-0_9_6~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42c5075f1769b06cf184f95331e9753becd785f0;p=platform%2Fupstream%2Fgst-plugins-good.git

check/elements/matroskamux.c: Fix leak in check.

Original commit message from CVS:
* check/elements/matroskamux.c: (setup_src_pad), (setup_sink_pad):
Fix leak in check.
---

diff --git a/ChangeLog b/ChangeLog
index 0ba9c21b2..2bbd47ecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-16  Wim Taymans  <wim@fluendo.com>
+
+	* check/elements/matroskamux.c: (setup_src_pad), (setup_sink_pad):
+	Fix leak in check.
+
 2005-11-16  Wim Taymans  <wim@fluendo.com>
 
 	* gst/flx/gstflxdec.c: (gst_flxdec_change_state):
diff --git a/check/elements/matroskamux.c b/check/elements/matroskamux.c
index 4c416e490..6c1ee77ae 100644
--- a/check/elements/matroskamux.c
+++ b/check/elements/matroskamux.c
@@ -59,12 +59,10 @@ setup_src_pad (GstElement * element,
     GstStaticPadTemplate * template, GstCaps * caps)
 {
   GstPad *srcpad, *sinkpad;
-  GstPadTemplate *templ;
 
   GST_DEBUG_OBJECT (element, "setting up sending pad");
   /* sending pad */
-  templ = gst_static_pad_template_get (template);
-  srcpad = gst_pad_new_from_template (templ, "src");
+  srcpad = gst_pad_new_from_static_template (template, "src");
   fail_if (srcpad == NULL, "Could not create a srcpad");
   ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
 
@@ -110,12 +108,10 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template,
     GstCaps * caps)
 {
   GstPad *srcpad, *sinkpad;
-  GstPadTemplate *templ;
 
   GST_DEBUG_OBJECT (element, "setting up receiving pad");
   /* receiving pad */
-  templ = gst_static_pad_template_get (template);
-  sinkpad = gst_pad_new_from_template (templ, "sink");
+  sinkpad = gst_pad_new_from_static_template (template, "sink");
 
   fail_if (sinkpad == NULL, "Could not create a sinkpad");
 
diff --git a/common b/common
index 3aa0adc0c..ea1409191 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3aa0adc0cc4539ec9bb62ccf6d535240dad19e58
+Subproject commit ea1409191cc1e71273b2dbdd94e7ab5fc5a60a51
diff --git a/tests/check/elements/matroskamux.c b/tests/check/elements/matroskamux.c
index 4c416e490..6c1ee77ae 100644
--- a/tests/check/elements/matroskamux.c
+++ b/tests/check/elements/matroskamux.c
@@ -59,12 +59,10 @@ setup_src_pad (GstElement * element,
     GstStaticPadTemplate * template, GstCaps * caps)
 {
   GstPad *srcpad, *sinkpad;
-  GstPadTemplate *templ;
 
   GST_DEBUG_OBJECT (element, "setting up sending pad");
   /* sending pad */
-  templ = gst_static_pad_template_get (template);
-  srcpad = gst_pad_new_from_template (templ, "src");
+  srcpad = gst_pad_new_from_static_template (template, "src");
   fail_if (srcpad == NULL, "Could not create a srcpad");
   ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1);
 
@@ -110,12 +108,10 @@ setup_sink_pad (GstElement * element, GstStaticPadTemplate * template,
     GstCaps * caps)
 {
   GstPad *srcpad, *sinkpad;
-  GstPadTemplate *templ;
 
   GST_DEBUG_OBJECT (element, "setting up receiving pad");
   /* receiving pad */
-  templ = gst_static_pad_template_get (template);
-  sinkpad = gst_pad_new_from_template (templ, "sink");
+  sinkpad = gst_pad_new_from_static_template (template, "sink");
 
   fail_if (sinkpad == NULL, "Could not create a sinkpad");