summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2015-10-20 17:29:42 +0300
committerSebastian Dröge <sebastian@centricular.com>2015-10-21 14:31:56 +0300
commit1efb4511542446b3c9e5b199fb2278236e559538 (patch)
tree95b04242f89045315adc5975add2ae313083ecd3
parent539265fcc567458a7e983c4864341853c87ad627 (diff)
Use new GST_ENABLE_EXTRA_CHECKS #define
https://bugzilla.gnome.org/show_bug.cgi?id=756870
-rw-r--r--configure.ac1
-rw-r--r--gst/gstpad.c4
-rw-r--r--libs/gst/base/gstbasetransform.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 0ffc9f1be..76818fc7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,7 @@ AG_GST_GETTEXT([gstreamer-$GST_API_VERSION])
dnl *** check for arguments to configure ***
AG_GST_ARG_DISABLE_FATAL_WARNINGS
+AG_GST_ARG_ENABLE_EXTRA_CHECKS
dnl subsystems - can influence other decisions so needs to be high up
dnl we need to AM_CONDITIONAL them here for automake 1.6.x compatibility
diff --git a/gst/gstpad.c b/gst/gstpad.c
index 586f9b55e..2cf377ccb 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -4054,7 +4054,7 @@ gst_pad_chain_data_unchecked (GstPad * pad, GstPadProbeType type, void *data)
if (G_UNLIKELY (GST_PAD_MODE (pad) != GST_PAD_MODE_PUSH))
goto wrong_mode;
-#ifndef G_DISABLE_ASSERT
+#ifdef GST_ENABLE_EXTRA_CHECKS
if (G_UNLIKELY (pad->priv->last_cookie != pad->priv->events_cookie)) {
if (!find_event_by_type (pad, GST_EVENT_STREAM_START, 0)) {
g_warning (G_STRLOC
@@ -4307,7 +4307,7 @@ gst_pad_push_data (GstPad * pad, GstPadProbeType type, void *data)
if (G_UNLIKELY (GST_PAD_MODE (pad) != GST_PAD_MODE_PUSH))
goto wrong_mode;
-#ifndef G_DISABLE_ASSERT
+#ifdef GST_ENABLE_EXTRA_CHECKS
if (G_UNLIKELY (pad->priv->last_cookie != pad->priv->events_cookie)) {
if (!find_event_by_type (pad, GST_EVENT_STREAM_START, 0)) {
g_warning (G_STRLOC
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index aa169c314..de04a4817 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -536,7 +536,7 @@ gst_base_transform_transform_caps (GstBaseTransform * trans,
ret = klass->transform_caps (trans, direction, caps, filter);
GST_LOG_OBJECT (trans, " to: %" GST_PTR_FORMAT, ret);
-#ifndef G_DISABLE_ASSERT
+#ifdef GST_ENABLE_EXTRA_CHECKS
if (filter) {
if (!gst_caps_is_subset (ret, filter)) {
GstCaps *intersection;