From: Jan Schmidt Date: Thu, 17 Sep 2015 14:20:13 +0000 (+1000) Subject: Don't throw compiler warnings with G_DISABLE_ASSERT X-Git-Tag: 1.19.3~511^2~1882^2~62 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e88ecc367bc8cce7568bca8e1ebb4a38f78fbed7;p=platform%2Fupstream%2Fgstreamer.git Don't throw compiler warnings with G_DISABLE_ASSERT Disable code that warns about unused variables when G_DISABLE_ASSERT is defined, as it is in tarballs and pre-releases. --- diff --git a/gst/audiomixer/gstaudioaggregator.c b/gst/audiomixer/gstaudioaggregator.c index c30bc64..1d3dcb5 100644 --- a/gst/audiomixer/gstaudioaggregator.c +++ b/gst/audiomixer/gstaudioaggregator.c @@ -625,13 +625,18 @@ void gst_audio_aggregator_set_sink_caps (GstAudioAggregator * aagg, GstAudioAggregatorPad * pad, GstCaps * caps) { +#ifndef G_DISABLE_ASSERT gboolean valid; GST_OBJECT_LOCK (pad); valid = gst_audio_info_from_caps (&pad->info, caps); - GST_OBJECT_UNLOCK (pad); - g_assert (valid); + +#else + GST_OBJECT_LOCK (pad); + (void) gst_audio_info_from_caps (&pad->info, caps); + GST_OBJECT_UNLOCK (pad); +#endif }