3 files changed, 6 insertions, 12 deletions
diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c
index 3a302af3..1169cef3 100644
--- a/gst/cdxaparse/gstcdxaparse.c
+++ b/gst/cdxaparse/gstcdxaparse.c
@@ -92,8 +92,7 @@ gst_cdxa_parse_init (GstCDXAParse * cdxaparse, GstCDXAParseClass * klass)
   GstCaps *caps;
 
   cdxaparse->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&sink_template_factory), "sink");
+      gst_pad_new_from_static_template (&sink_template_factory, "sink");
   gst_pad_set_activate_function (cdxaparse->sinkpad,
       GST_DEBUG_FUNCPTR (gst_cdxa_parse_sink_activate));
   gst_pad_set_activatepull_function (cdxaparse->sinkpad,
@@ -102,8 +101,7 @@ gst_cdxa_parse_init (GstCDXAParse * cdxaparse, GstCDXAParseClass * klass)
   gst_element_add_pad (GST_ELEMENT (cdxaparse), cdxaparse->sinkpad);
 
   cdxaparse->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&src_template_factory), "src");
+      gst_pad_new_from_static_template (&src_template_factory, "src");
 
   gst_pad_set_event_function (cdxaparse->srcpad,
       GST_DEBUG_FUNCPTR (gst_cdxa_parse_src_event));
diff --git a/gst/cdxaparse/gstcdxastrip.c b/gst/cdxaparse/gstcdxastrip.c
index 00124b30..80bf7c87 100644
--- a/gst/cdxaparse/gstcdxastrip.c
+++ b/gst/cdxaparse/gstcdxastrip.c
@@ -116,14 +116,12 @@ gst_cdxastrip_init (GstCDXAStrip * cdxastrip)
   GST_OBJECT_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
 
   cdxastrip->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&sink_template_factory), "sink");
+      gst_pad_new_from_static_template (&sink_template_factory, "sink");
   gst_pad_set_chain_function (cdxastrip->sinkpad, gst_cdxastrip_chain);
   gst_element_add_pad (GST_ELEMENT (cdxastrip), cdxastrip->sinkpad);
 
   cdxastrip->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&src_template_factory), "src");
+      gst_pad_new_from_static_template (&src_template_factory, "src");
   gst_pad_set_formats_function (cdxastrip->srcpad,
       gst_cdxastrip_get_src_formats);
   gst_pad_set_event_mask_function (cdxastrip->srcpad,
diff --git a/gst/cdxaparse/gstvcdparse.c b/gst/cdxaparse/gstvcdparse.c
index 00124b30..80bf7c87 100644
--- a/gst/cdxaparse/gstvcdparse.c
+++ b/gst/cdxaparse/gstvcdparse.c
@@ -116,14 +116,12 @@ gst_cdxastrip_init (GstCDXAStrip * cdxastrip)
   GST_OBJECT_FLAG_SET (cdxastrip, GST_ELEMENT_EVENT_AWARE);
 
   cdxastrip->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&sink_template_factory), "sink");
+      gst_pad_new_from_static_template (&sink_template_factory, "sink");
   gst_pad_set_chain_function (cdxastrip->sinkpad, gst_cdxastrip_chain);
   gst_element_add_pad (GST_ELEMENT (cdxastrip), cdxastrip->sinkpad);
 
   cdxastrip->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&src_template_factory), "src");
+      gst_pad_new_from_static_template (&src_template_factory, "src");
   gst_pad_set_formats_function (cdxastrip->srcpad,
       gst_cdxastrip_get_src_formats);
   gst_pad_set_event_mask_function (cdxastrip->srcpad,