diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-01-06 19:21:56 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-01-06 19:21:56 +0000 |
| commit | cbdff26c106d2adb06dd149769f4955d8fbec1fc (patch) | |
| tree | 86a2bec883421d25e0be4758c5f649e8eff52a2f /gst | |
| parent | 757dc90faa163a235e1d16791a0a0f8c74715768 (diff) | |
Revert "padtemplate: allow disablinbg the template name conformance checks"
This reverts commit f9039c22040e1a38a3691bc4d299af427c963255.
We use -DG_DISABLE_ASSERTS for releases and pre-releases, but
don't want to disable pad name checking for releases in general,
I think. Need a better solution here. Fixes pad unit test in
pre-release/release mode.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/gstpadtemplate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/gstpadtemplate.c b/gst/gstpadtemplate.c index ca2f949653..8bf5ae0fee 100644 --- a/gst/gstpadtemplate.c +++ b/gst/gstpadtemplate.c @@ -256,10 +256,9 @@ gst_pad_template_dispose (GObject * object) * 'sink%d' template is automatically selected), so we need to restrict their * naming. */ -static inline gboolean +static gboolean name_is_valid (const gchar * name, GstPadPresence presence) { -#ifndef G_DISABLE_ASSERT const gchar *str; if (presence == GST_PAD_ALWAYS) { @@ -285,7 +284,7 @@ name_is_valid (const gchar * name, GstPadPresence presence) return FALSE; } } -#endif + return TRUE; } |