summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-09-12 09:10:35 +0200
committerTim-Philipp Müller <tim@centricular.net>2012-09-12 09:13:30 +0100
commitb04e61d8a4488ced6143150a11bd46988514ff4c (patch)
tree2e63f6335b19014ac6dbad859232e48b3d8da07a
parent3bb23a5e985043ba0510958627a0a7b9993264de (diff)
opus + jpegformat: unbreak non-debug buildHEADmaster
opus + jpegformat plugin builds fail when gstreamer is configured with --disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol instead of GST_DISABLE_GST_DEBUG. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> https://bugzilla.gnome.org/show_bug.cgi?id=683850
-rw-r--r--ext/opus/gstopusdec.c2
-rw-r--r--ext/opus/gstopusenc.c4
-rw-r--r--gst/jpegformat/gstjpegparse.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
index 0e2805cc0..ab7221d7b 100644
--- a/ext/opus/gstopusdec.c
+++ b/ext/opus/gstopusdec.c
@@ -375,7 +375,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer)
GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz",
dec->n_channels, dec->sample_rate);
-#ifndef GST_DISABLE_DEBUG
+#ifndef GST_DISABLE_GST_DEBUG
gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug,
"Mapping table", dec->n_channels, dec->channel_mapping);
#endif
diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
index 240a2cb16..d9917951c 100644
--- a/ext/opus/gstopusenc.c
+++ b/ext/opus/gstopusenc.c
@@ -574,7 +574,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc,
}
}
-#ifndef GST_DISABLE_DEBUG
+#ifndef GST_DISABLE_GST_DEBUG
GST_INFO_OBJECT (enc,
"Mapping tables built: %d channels, %d stereo streams", enc->n_channels,
enc->n_stereo_streams);
@@ -641,7 +641,7 @@ gst_opus_enc_setup (GstOpusEnc * enc)
{
int error = OPUS_OK;
-#ifndef GST_DISABLE_DEBUG
+#ifndef GST_DISABLE_GST_DEBUG
GST_DEBUG_OBJECT (enc,
"setup: %d Hz, %d channels, %d stereo streams, family %d",
enc->sample_rate, enc->n_channels, enc->n_stereo_streams,
diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
index f984a5242..b4af9ed90 100644
--- a/gst/jpegformat/gstjpegparse.c
+++ b/gst/jpegformat/gstjpegparse.c
@@ -524,7 +524,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
if (!gst_byte_reader_get_uint16_be (reader, &size))
return FALSE;
-#ifndef GST_DISABLE_DEBUG
+#ifndef GST_DISABLE_GST_DEBUG
/* We'd pry the id of the skipped application segment */
if (marker >= APP0 && marker <= APP15) {
const gchar *id_str = NULL;
@@ -540,7 +540,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
#else
GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker,
size);
-#endif // GST_DISABLE_DEBUG
+#endif // GST_DISABLE_GST_DEBUG
if (!gst_byte_reader_skip (reader, size - 2))
return FALSE;