wok-next annotate gst0-plugins-bad/stuff/patches/opus-jpegformat-unbreak-non-debug-build.patch @ rev 20621

Add: fluxcomp, ldns, libndp, libnsl, nghttp2; up: directfb, libevent, libnl, libsoup, links, neon, serf
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Apr 25 13:24:59 2018 +0300 (2018-04-25)
parents
children
rev   line source
al@19829 1 From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001
al@19829 2 From: Peter Korsgaard <jacmet@sunsite.dk>
al@19829 3 Date: Wed, 12 Sep 2012 09:10:35 +0200
al@19829 4 Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build
al@19829 5
al@19829 6 opus + jpegformat plugin builds fail when gstreamer is configured with
al@19829 7 --disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol
al@19829 8 instead of GST_DISABLE_GST_DEBUG.
al@19829 9
al@19829 10 Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850
al@19829 11
al@19829 12 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
al@19829 13 ---
al@19829 14 ext/opus/gstopusdec.c | 2 +-
al@19829 15 ext/opus/gstopusenc.c | 4 ++--
al@19829 16 gst/jpegformat/gstjpegparse.c | 4 ++--
al@19829 17 3 files changed, 5 insertions(+), 5 deletions(-)
al@19829 18
al@19829 19 diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c
al@19829 20 index 0e2805c..ab7221d 100644
al@19829 21 --- a/ext/opus/gstopusdec.c
al@19829 22 +++ b/ext/opus/gstopusdec.c
al@19829 23 @@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer)
al@19829 24
al@19829 25 GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz",
al@19829 26 dec->n_channels, dec->sample_rate);
al@19829 27 -#ifndef GST_DISABLE_DEBUG
al@19829 28 +#ifndef GST_DISABLE_GST_DEBUG
al@19829 29 gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug,
al@19829 30 "Mapping table", dec->n_channels, dec->channel_mapping);
al@19829 31 #endif
al@19829 32 diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
al@19829 33 index 240a2cb..d991795 100644
al@19829 34 --- a/ext/opus/gstopusenc.c
al@19829 35 +++ b/ext/opus/gstopusenc.c
al@19829 36 @@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc,
al@19829 37 }
al@19829 38 }
al@19829 39
al@19829 40 -#ifndef GST_DISABLE_DEBUG
al@19829 41 +#ifndef GST_DISABLE_GST_DEBUG
al@19829 42 GST_INFO_OBJECT (enc,
al@19829 43 "Mapping tables built: %d channels, %d stereo streams", enc->n_channels,
al@19829 44 enc->n_stereo_streams);
al@19829 45 @@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc)
al@19829 46 {
al@19829 47 int error = OPUS_OK;
al@19829 48
al@19829 49 -#ifndef GST_DISABLE_DEBUG
al@19829 50 +#ifndef GST_DISABLE_GST_DEBUG
al@19829 51 GST_DEBUG_OBJECT (enc,
al@19829 52 "setup: %d Hz, %d channels, %d stereo streams, family %d",
al@19829 53 enc->sample_rate, enc->n_channels, enc->n_stereo_streams,
al@19829 54 diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
al@19829 55 index f984a52..b4af9ed 100644
al@19829 56 --- a/gst/jpegformat/gstjpegparse.c
al@19829 57 +++ b/gst/jpegformat/gstjpegparse.c
al@19829 58 @@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
al@19829 59 if (!gst_byte_reader_get_uint16_be (reader, &size))
al@19829 60 return FALSE;
al@19829 61
al@19829 62 -#ifndef GST_DISABLE_DEBUG
al@19829 63 +#ifndef GST_DISABLE_GST_DEBUG
al@19829 64 /* We'd pry the id of the skipped application segment */
al@19829 65 if (marker >= APP0 && marker <= APP15) {
al@19829 66 const gchar *id_str = NULL;
al@19829 67 @@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse,
al@19829 68 #else
al@19829 69 GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker,
al@19829 70 size);
al@19829 71 -#endif // GST_DISABLE_DEBUG
al@19829 72 +#endif // GST_DISABLE_GST_DEBUG
al@19829 73
al@19829 74 if (!gst_byte_reader_skip (reader, size - 2))
al@19829 75 return FALSE;
al@19829 76 --
al@19829 77 1.7.10
al@19829 78