summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-19 15:01:46 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-19 15:01:46 +0100
commit0e285b3d299cebc2deaae4f3ab9fee7907d96a95 (patch)
tree2075bd58f3db2c008c8eba107fe1b7c8133aaced
parentb4cf5714a70a03d83b918c7aae0c86fa34753d66 (diff)
x264enc, rdtmanager: fix compilation with debugging disabled
-rw-r--r--ext/x264/gstx264enc.c4
-rw-r--r--gst/realmedia/rdtmanager.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index 0bcd4434..63832c65 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 b4bf3af9..2c1158fb 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 */