5 files changed, 13 insertions, 16 deletions
diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c
index f5fce4bc..af8bc99e 100644
--- a/gst/dvdspu/gstdvdspu.c
+++ b/gst/dvdspu/gstdvdspu.c
@@ -716,12 +716,11 @@ gst_dvd_spu_redraw_still (GstDVDSpu * dvdspu, gboolean force)
 static void
 gst_dvd_spu_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event)
 {
-  const GstStructure *structure = gst_event_get_structure (event);
-  const gchar *event_type = gst_structure_get_string (structure, "event");
   gboolean hl_change = FALSE;
 
   GST_INFO_OBJECT (dvdspu, "DVD event of type %s on subp pad OOB=%d",
-      event_type, (GST_EVENT_TYPE (event) == GST_EVENT_CUSTOM_DOWNSTREAM_OOB));
+      gst_structure_get_string (event->structure, "event"),
+      (GST_EVENT_TYPE (event) == GST_EVENT_CUSTOM_DOWNSTREAM_OOB));
 
   switch (dvdspu->spu_input_type) {
     case SPU_INPUT_TYPE_VOBSUB:
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c
index d10f54f0..25fa4063 100644
--- a/gst/liveadder/liveadder.c
+++ b/gst/liveadder/liveadder.c
@@ -1349,9 +1349,8 @@ no_clock:
 
 pause:
   {
-    const gchar *reason = gst_flow_get_name (result);
-
-    GST_DEBUG_OBJECT (adder, "pausing task, reason %s", reason);
+    GST_DEBUG_OBJECT (adder, "pausing task, reason %s",
+        gst_flow_get_name (result));
 
     GST_OBJECT_LOCK (adder);
 
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index f24c4a3e..2df635bc 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -523,6 +523,8 @@ mpegtsmux_choose_best_stream (MpegTsMux * mux)
   return best;
 }
 
+#define COLLECT_DATA_PAD(collect_data) ((GstCollectData *)(collect_data))->pad)
+
 static GstFlowReturn
 mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
 {
@@ -540,10 +542,8 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
 
     if (mux->pcr_stream == NULL) {
       if (best) {
-        GstCollectData *c_data = (GstCollectData *) best;
         /* Take the first data stream for the PCR */
-        GST_DEBUG_OBJECT (mux, "Use stream from pad %" GST_PTR_FORMAT " as PCR",
-            c_data->pad);
+        GST_DEBUG_OBJECT (COLLECT_DATA_PAD (best), "Use stream as PCR");
         mux->pcr_stream = best->stream;
       }
     }
@@ -564,14 +564,12 @@ mpegtsmux_collected (GstCollectPads * pads, MpegTsMux * mux)
 
   if (best != NULL) {
     GstBuffer *buf = best->queued_buf;
-    GstCollectData *c_data = (GstCollectData *) best;
     gint64 pts = -1;
 
     g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
 
-    GST_DEBUG_OBJECT (mux,
-        "Chose stream from pad %" GST_PTR_FORMAT " for output (PID: 0x%04x)",
-        c_data->pad, best->pid);
+    GST_DEBUG_OBJECT (COLLECT_DATA_PAD (best),
+        "Chose stream for output (PID: 0x%04x)", best->pid);
 
     if (GST_CLOCK_TIME_IS_VALID (best->cur_ts)) {
       pts = GSTTIME_TO_MPEGTIME (best->cur_ts);
diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c
index 312b33f4..d0badbfc 100644
--- a/gst/mpegvideoparse/mpegvideoparse.c
+++ b/gst/mpegvideoparse/mpegvideoparse.c
@@ -278,6 +278,7 @@ mpegvideoparse_handle_sequence (MpegVideoParse * mpegvideoparse,
   return TRUE;
 }
 
+#ifndef GST_DISABLE_GST_DEBUG
 static const gchar *
 picture_start_code_name (guint8 psc)
 {
@@ -333,6 +334,7 @@ picture_type_name (guint8 pct)
 
   return "Reserved/Unknown";
 }
+#endif /* GST_DISABLE_GST_DEBUG */
 
 static gboolean
 mpegvideoparse_handle_picture (MpegVideoParse * mpegvideoparse, GstBuffer * buf)
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
index e023df10..55126054 100644
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
@@ -1688,9 +1688,8 @@ flushing:
   }
 pause:
   {
-    const gchar *reason = gst_flow_get_name (result);
-
-    GST_DEBUG_OBJECT (jitterbuffer, "pausing task, reason %s", reason);
+    GST_DEBUG_OBJECT (jitterbuffer, "pausing task, reason %s",
+        gst_flow_get_name (result));
 
     JBUF_LOCK (priv);
     /* store result */