3 files changed, 6 insertions, 17 deletions
diff --git a/ext/amrwb/gstamrwbdec.c b/ext/amrwb/gstamrwbdec.c
index 792addd7..57de2c7a 100644
--- a/ext/amrwb/gstamrwbdec.c
+++ b/ext/amrwb/gstamrwbdec.c
@@ -97,18 +97,14 @@ static void
 gst_amrwbdec_init (GstAmrwbDec * amrwbdec, GstAmrwbDecClass * klass)
 {
   /* create the sink pad */
-  amrwbdec->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
-      "sink");
+  amrwbdec->sinkpad = gst_pad_new_from_static_template (&sink_template, "sink");
   gst_pad_set_setcaps_function (amrwbdec->sinkpad, gst_amrwbdec_setcaps);
   gst_pad_set_event_function (amrwbdec->sinkpad, gst_amrwbdec_event);
   gst_pad_set_chain_function (amrwbdec->sinkpad, gst_amrwbdec_chain);
   gst_element_add_pad (GST_ELEMENT (amrwbdec), amrwbdec->sinkpad);
 
   /* create the src pad */
-  amrwbdec->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&src_template),
-      "src");
+  amrwbdec->srcpad = gst_pad_new_from_static_template (&src_template, "src");
   gst_pad_use_fixed_caps (amrwbdec->srcpad);
   gst_element_add_pad (GST_ELEMENT (amrwbdec), amrwbdec->srcpad);
 
diff --git a/ext/amrwb/gstamrwbenc.c b/ext/amrwb/gstamrwbenc.c
index 0d8e91e0..52f303cd 100644
--- a/ext/amrwb/gstamrwbenc.c
+++ b/ext/amrwb/gstamrwbenc.c
@@ -89,17 +89,13 @@ static void
 gst_amrwbenc_init (GstAmrwbEnc * amrwbenc, GstAmrwbEncClass * klass)
 {
   /* create the sink pad */
-  amrwbenc->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
-      "sink");
+  amrwbenc->sinkpad = gst_pad_new_from_static_template (&sink_template, "sink");
   gst_pad_set_setcaps_function (amrwbenc->sinkpad, gst_amrwbenc_setcaps);
   gst_pad_set_chain_function (amrwbenc->sinkpad, gst_amrwbenc_chain);
   gst_element_add_pad (GST_ELEMENT (amrwbenc), amrwbenc->sinkpad);
 
   /* create the src pad */
-  amrwbenc->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&src_template),
-      "src");
+  amrwbenc->srcpad = gst_pad_new_from_static_template (&src_template, "src");
   gst_pad_use_fixed_caps (amrwbenc->srcpad);
   gst_element_add_pad (GST_ELEMENT (amrwbenc), amrwbenc->srcpad);
 
diff --git a/ext/amrwb/gstamrwbparse.c b/ext/amrwb/gstamrwbparse.c
index b233878c..d5afc6df 100644
--- a/ext/amrwb/gstamrwbparse.c
+++ b/ext/amrwb/gstamrwbparse.c
@@ -95,8 +95,7 @@ gst_amrwbparse_init (GstAmrwbParse * amrwbparse, GstAmrwbParseClass * klass)
 {
   /* create the sink pad */
   amrwbparse->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
-      "sink");
+      gst_pad_new_from_static_template (&sink_template, "sink");
   gst_pad_set_chain_function (amrwbparse->sinkpad,
       GST_DEBUG_FUNCPTR (gst_amrwbparse_chain));
 
@@ -108,9 +107,7 @@ gst_amrwbparse_init (GstAmrwbParse * amrwbparse, GstAmrwbParseClass * klass)
   gst_element_add_pad (GST_ELEMENT (amrwbparse), amrwbparse->sinkpad);
 
   /* create the src pad */
-  amrwbparse->srcpad =
-      gst_pad_new_from_template (gst_static_pad_template_get (&src_template),
-      "src");
+  amrwbparse->srcpad = gst_pad_new_from_static_template (&src_template, "src");
   gst_pad_set_query_function (amrwbparse->srcpad,
       GST_DEBUG_FUNCPTR (gst_amrwbparse_query));
   gst_pad_set_query_type_function (amrwbparse->srcpad,