From 8f1c9746eae406efa1619a890bfc35d96fb485e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 28 May 2006 17:33:13 +0000 Subject: [PATCH] gst/: GST_PTR_FORMAT should be used to print caps in debug statements. Original commit message from CVS: * gst/alpha/gstalphacolor.c: (gst_alpha_color_transform_caps): * gst/debug/negotiation.c: (gst_negotiation_update_caps): * gst/rtp/gstrtpilbcdepay.c: (gst_rtp_ilbc_depay_setcaps): GST_PTR_FORMAT should be used to print caps in debug statements. --- ChangeLog | 7 +++++++ gst/alpha/gstalphacolor.c | 10 +--------- gst/debug/negotiation.c | 5 +---- gst/rtp/gstrtpilbcdepay.c | 6 ++---- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index a986b147d1..e1a139590e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-28 Tim-Philipp Müller + + * gst/alpha/gstalphacolor.c: (gst_alpha_color_transform_caps): + * gst/debug/negotiation.c: (gst_negotiation_update_caps): + * gst/rtp/gstrtpilbcdepay.c: (gst_rtp_ilbc_depay_setcaps): + GST_PTR_FORMAT should be used to print caps in debug statements. + 2006-05-28 Tim-Philipp Müller Patch by: Sebastian Dröge diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c index f7f8fc5599..3cf6c7cfc8 100644 --- a/gst/alpha/gstalphacolor.c +++ b/gst/alpha/gstalphacolor.c @@ -180,15 +180,7 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans, gst_caps_unref (local_caps); gst_caps_do_simplify (result); - { - gchar *caps_str, *result_str; - - caps_str = gst_caps_to_string (caps); - result_str = gst_caps_to_string (result); - GST_LOG ("transformed %s to %s", caps_str, result_str); - g_free (caps_str); - g_free (result_str); - } + GST_LOG ("transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT, caps, result); return result; } diff --git a/gst/debug/negotiation.c b/gst/debug/negotiation.c index 21357da3ed..e90cb4c5f0 100644 --- a/gst/debug/negotiation.c +++ b/gst/debug/negotiation.c @@ -237,7 +237,6 @@ gst_negotiation_update_caps (GstNegotiation * negotiation) GstCaps *srccaps; GstCaps *sinkcaps; GstCaps *icaps; - gchar *icapsstr; srccaps = gst_pad_get_allowed_caps (negotiation->srcpad); sinkcaps = gst_pad_get_allowed_caps (negotiation->sinkpad); @@ -248,9 +247,7 @@ gst_negotiation_update_caps (GstNegotiation * negotiation) gst_caps_replace (&negotiation->caps, icaps); g_object_notify (G_OBJECT (negotiation), "allowed-caps"); - icapsstr = gst_caps_to_string (icaps); - GST_DEBUG ("notify %s", icapsstr); - g_free (icapsstr); + GST_DEBUG ("notify %" GST_PTR_FORMAT, icaps); } static void diff --git a/gst/rtp/gstrtpilbcdepay.c b/gst/rtp/gstrtpilbcdepay.c index 11002b3a29..f2ff600367 100644 --- a/gst/rtp/gstrtpilbcdepay.c +++ b/gst/rtp/gstrtpilbcdepay.c @@ -148,7 +148,6 @@ gst_rtp_ilbc_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) GstRTPiLBCDepay *rtpilbcdepay = GST_RTP_ILBC_DEPAY (depayload); GstCaps *srccaps; GstStructure *structure; - gchar *str; gboolean ret; srccaps = gst_caps_copy (gst_static_pad_template_get_caps @@ -156,11 +155,10 @@ gst_rtp_ilbc_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) structure = gst_caps_get_structure (srccaps, 0); gst_structure_set (structure, "mode", G_TYPE_INT, rtpilbcdepay->mode == GST_ILBC_MODE_30 ? 30 : 20, NULL); + ret = gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload), srccaps); - str = gst_caps_to_string (srccaps) - GST_DEBUG ("caps set on source are %s", str); - g_free (str); + GST_DEBUG ("set caps on source: %" GST_PTR_FORMAT " (ret=%d)", srccaps, ret); gst_caps_unref (srccaps); return ret;