From 0e285b3d299cebc2deaae4f3ab9fee7907d96a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 19 Jun 2009 15:01:46 +0100 Subject: [PATCH] x264enc, rdtmanager: fix compilation with debugging disabled --- ext/x264/gstx264enc.c | 4 +++- gst/realmedia/rdtmanager.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 0bcd443425..63832c6516 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -400,6 +400,7 @@ void gst_x264_enc_log_callback (gpointer private, gint level, const char *format, va_list args) { +#ifndef GST_DISABLE_GST_DEBUG GstDebugLevel gst_level; GObject *object = (GObject *) private; @@ -424,6 +425,7 @@ gst_x264_enc_log_callback (gpointer private, gint level, const char *format, gst_debug_log_valist (x264_enc_debug, gst_level, "", "", 0, object, format, args); +#endif /* GST_DISABLE_GST_DEBUG */ } /* initialize the new element @@ -488,7 +490,7 @@ gst_x264_enc_init (GstX264Enc * encoder, GstX264EncClass * klass) x264_param_default (&encoder->x264param); /* log callback setup; part of parameters */ - encoder->x264param.pf_log = GST_DEBUG_FUNCPTR (gst_x264_enc_log_callback); + encoder->x264param.pf_log = gst_x264_enc_log_callback; encoder->x264param.p_log_private = encoder; encoder->x264param.i_log_level = X264_LOG_DEBUG; diff --git a/gst/realmedia/rdtmanager.c b/gst/realmedia/rdtmanager.c index b4bf3af97c..2c1158fb0f 100644 --- a/gst/realmedia/rdtmanager.c +++ b/gst/realmedia/rdtmanager.c @@ -874,9 +874,8 @@ do_eos: } pause: { - const gchar *reason = gst_flow_get_name (result); - - GST_DEBUG_OBJECT (rdtmanager, "pausing task, reason %s", reason); + GST_DEBUG_OBJECT (rdtmanager, "pausing task, reason %s", + gst_flow_get_name (result)); JBUF_LOCK (session); /* store result */