diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-03 16:37:53 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-03 16:37:53 -0400 |
| commit | 7f3bcd484b465d8216ac419754450adf07e9b0d2 (patch) | |
| tree | 5320e188d7719d8fba29beaf7da8f6f73e51e4e8 /gst/aacparse/gstbaseparse.c | |
| parent | b19dd5920605c0036dacf19591a6feca7a736a50 (diff) | |
| parent | e14bfea0c44aafba65239cbff9c6a4a93e0ae41a (diff) | |
| download | gst-plugins-bad-7f3bcd484b465d8216ac419754450adf07e9b0d2.tar.gz gst-plugins-bad-7f3bcd484b465d8216ac419754450adf07e9b0d2.tar.bz2 gst-plugins-bad-7f3bcd484b465d8216ac419754450adf07e9b0d2.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'gst/aacparse/gstbaseparse.c')
| -rw-r--r-- | gst/aacparse/gstbaseparse.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gst/aacparse/gstbaseparse.c b/gst/aacparse/gstbaseparse.c index 34d28ec2..026b1341 100644 --- a/gst/aacparse/gstbaseparse.c +++ b/gst/aacparse/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); } |