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