summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorJan Schmidt <jan@centricular.com>2015-09-18 00:20:13 +1000
committerJan Schmidt <jan@centricular.com>2015-09-18 00:29:51 +1000
commit587e7c4a23d8364f13e3710cea75d4a72b2b301f (patch)
tree9e49f13dcbee20af2b3823dab726c28ec7ab12af /gst
parentf82840ce88a159de7cbd2afe8cd2f32843c9105d (diff)
downloadgstreamer-plugins-bad-587e7c4a23d8364f13e3710cea75d4a72b2b301f.tar.gz
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.
Diffstat (limited to 'gst')
-rw-r--r--gst/audiomixer/gstaudioaggregator.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gst/audiomixer/gstaudioaggregator.c b/gst/audiomixer/gstaudioaggregator.c
index c30bc6486..1d3dcb56b 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
}