From 279727d777ad0aa4ae89230e7a71d9982dd48f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 1 Jun 2009 13:47:01 +0100 Subject: baseparse: don't try to GST_LOG an already-freed caps string The proper way to log caps is via GST_PTR_FORMAT anyway. --- gst/amrparse/gstbaseparse.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gst/amrparse/gstbaseparse.c') diff --git a/gst/amrparse/gstbaseparse.c b/gst/amrparse/gstbaseparse.c index e0f1f4d7..cd170636 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); } -- cgit v1.2.1 From 44cee1789ca00eb399ef4aa1fe4e5401dfa82262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 1 Jun 2009 13:56:18 +0100 Subject: baseparse: propagate return value of GstBaseParse::set_sink_caps() gst_base_parse_sink_setcaps() presumably should fail if the subclass returns FALSE from its ::set_sink_caps() function. --- gst/amrparse/gstbaseparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gst/amrparse/gstbaseparse.c') diff --git a/gst/amrparse/gstbaseparse.c b/gst/amrparse/gstbaseparse.c index cd170636..ad963785 100644 --- a/gst/amrparse/gstbaseparse.c +++ b/gst/amrparse/gstbaseparse.c @@ -1739,5 +1739,5 @@ gst_base_parse_sink_setcaps (GstPad * pad, GstCaps * caps) res = klass->set_sink_caps (parse, caps); parse->negotiated = res; - return gst_pad_set_caps (pad, caps); + return res && gst_pad_set_caps (pad, caps); } -- cgit v1.2.1