summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2005-11-16 19:08:54 +0000
committerWim Taymans <wim.taymans@gmail.com>2005-11-16 19:08:54 +0000
commit42c5075f1769b06cf184f95331e9753becd785f0 (patch)
treeea7e7cbda95969a394eef6ec2c56b8af78cfe0aa
parentd94e691beeba2ab03645a4cda2316954ddfe1809 (diff)
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.
-rw-r--r--ChangeLog5
-rw-r--r--check/elements/matroskamux.c8
m---------common0
-rw-r--r--tests/check/elements/matroskamux.c8
4 files changed, 9 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ba9c21b..2bbd47ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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):
Fix state change.
diff --git a/check/elements/matroskamux.c b/check/elements/matroskamux.c
index 4c416e49..6c1ee77a 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
-Subproject 3aa0adc0cc4539ec9bb62ccf6d535240dad19e5
+Subproject ea1409191cc1e71273b2dbdd94e7ab5fc5a60a5
diff --git a/tests/check/elements/matroskamux.c b/tests/check/elements/matroskamux.c
index 4c416e49..6c1ee77a 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");