2 files changed, 3 insertions, 8 deletions
diff --git a/gst/amrparse/gstamrparse.c b/gst/amrparse/gstamrparse.c
index 5ec0c6c2..64cf9547 100644
--- a/gst/amrparse/gstamrparse.c
+++ b/gst/amrparse/gstamrparse.c
@@ -210,7 +210,6 @@ gst_amrparse_set_src_caps (GstAmrParse * amrparse)
   }
   gst_pad_use_fixed_caps (GST_BASE_PARSE (amrparse)->srcpad);
   res = gst_pad_set_caps (GST_BASE_PARSE (amrparse)->srcpad, src_caps);
-  gst_pad_fixate_caps (GST_BASE_PARSE (amrparse)->srcpad, src_caps);
   gst_caps_unref (src_caps);
   return res;
 }
diff --git a/gst/amrparse/gstbaseparse.c b/gst/amrparse/gstbaseparse.c
index e0f1f4d7..ad963785 100644
--- a/gst/amrparse/gstbaseparse.c
+++ b/gst/amrparse/gstbaseparse.c
@@ -1730,18 +1730,14 @@ gst_base_parse_sink_setcaps (GstPad * pad, GstCaps * caps)
   GstBaseParseClass *klass;
   gboolean res = TRUE;
 
-  gchar *caps_str = gst_caps_to_string (caps);
-  g_free (caps_str);
-
-  parse = GST_BASE_PARSE (gst_pad_get_parent (pad));
+  parse = GST_BASE_PARSE (GST_PAD_PARENT (pad));
   klass = GST_BASE_PARSE_GET_CLASS (parse);
 
-  GST_DEBUG_OBJECT (parse, "setcaps: %s", caps_str);
+  GST_DEBUG_OBJECT (parse, "caps: %" GST_PTR_FORMAT, caps);
 
   if (klass->set_sink_caps)
     res = klass->set_sink_caps (parse, caps);
 
   parse->negotiated = res;
-  gst_object_unref (parse);
-  return gst_pad_set_caps (pad, caps);
+  return res && gst_pad_set_caps (pad, caps);
 }