[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gstreamer-cvs
Subject:    [0.11] gst-plugins-base: audio: don't use GST_PTR_FORMAT for segments
From:       tpm () kemper ! freedesktop ! org (Tim Müller)
Date:       2011-09-30 9:56:23
Message-ID: 20110930095623.B42F310009 () kemper ! freedesktop ! org
[Download RAW message or body]

Module: gst-plugins-base
Branch: 0.11
Commit: 6ec5fc8d9507b25051e82711af792ad9c5f610c4
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=6ec5fc8d9507b25051e82711af792ad9c5f610c4


Author: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date:   Fri Sep 30 10:54:26 2011 +0100

audio: don't use GST_PTR_FORMAT for segments

Avoids crashes with debugging output enabled.

---

 gst-libs/gst/audio/gstaudiodecoder.c |    7 ++++---
 gst-libs/gst/audio/gstaudioencoder.c |    5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gst-libs/gst/audio/gstaudiodecoder.c \
b/gst-libs/gst/audio/gstaudiodecoder.c index cd051a3..ec9f6d6 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -580,7 +580,7 @@ gst_audio_decoder_setup (GstAudioDecoder * dec)
   gst_query_unref (query);
 
   /* normalize to bool */
-  dec->priv->agg = !!res;
+  dec->priv->agg = ! !res;
 }
 
 /* mini aggregator combining output buffers into fewer larger ones,
@@ -1353,10 +1353,11 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, \
GstEvent * event)  gst_event_copy_segment (event, &seg);
 
       if (seg.format == GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (dec, "received TIME SEGMENT %" GST_PTR_FORMAT, &seg);
+        GST_DEBUG_OBJECT (dec, "received TIME SEGMENT %" GST_SEGMENT_FORMAT,
+            &seg);
       } else {
         gint64 nstart;
-        GST_DEBUG_OBJECT (dec, "received SEGMENT %" GST_PTR_FORMAT, &seg);
+        GST_DEBUG_OBJECT (dec, "received SEGMENT %" GST_SEGMENT_FORMAT, &seg);
         /* handle newsegment resulting from legacy simple seeking */
         /* note that we need to convert this whether or not enough data
          * to handle initial newsegment */
diff --git a/gst-libs/gst/audio/gstaudioencoder.c \
b/gst-libs/gst/audio/gstaudioencoder.c index ad0fb8e..239fa48 100644
--- a/gst-libs/gst/audio/gstaudioencoder.c
+++ b/gst-libs/gst/audio/gstaudioencoder.c
@@ -1227,9 +1227,10 @@ gst_audio_encoder_sink_eventfunc (GstAudioEncoder * enc, \
GstEvent * event)  gst_event_copy_segment (event, &seg);
 
       if (seg.format == GST_FORMAT_TIME) {
-        GST_DEBUG_OBJECT (enc, "received TIME SEGMENT %" GST_PTR_FORMAT, &seg);
+        GST_DEBUG_OBJECT (enc, "received TIME SEGMENT %" GST_SEGMENT_FORMAT,
+            &seg);
       } else {
-        GST_DEBUG_OBJECT (enc, "received SEGMENT %" GST_PTR_FORMAT, &seg);
+        GST_DEBUG_OBJECT (enc, "received SEGMENT %" GST_SEGMENT_FORMAT, &seg);
         GST_DEBUG_OBJECT (enc, "unsupported format; ignoring");
         break;
       }



_______________________________________________
gstreamer-commits mailing list
gstreamer-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits


[prev in list] [next in list] [prev in thread] [next in thread]