mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-09 17:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gst.c: fix for G_DISABLE_ASSERT

Browse source 
Original commit message from CVS:
* gst/gst.c: (gst_register_core_elements):
fix for G_DISABLE_ASSERT
* gst/gstinfo.c: (__gst_in_valgrind):
add for GST_DISABLE_DEBUG
This commit is contained in:
Benjamin Otte 2004-08-03 12:40:47 +00:00
parent f8f2f5a58d
commit afc9c06eb5
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-08-03 Benjamin Otte <otte@gnome.org>
* gst/gst.c: (gst_register_core_elements):
fix for G_DISABLE_ASSERT
* gst/gstinfo.c: (__gst_in_valgrind):
add for GST_DISABLE_DEBUG
2004-08-03 Benjamin Otte <otte@gnome.org> 2004-08-03 Benjamin Otte <otte@gnome.org>
* gst/parse/parse.l: * gst/parse/parse.l:

16
gst/gst.c
View file

@ -520,14 +520,14 @@ static gboolean
gst_register_core_elements (GstPlugin * plugin) gst_register_core_elements (GstPlugin * plugin)
{ {
/* register some standard builtin types */ /* register some standard builtin types */
g_assert (gst_element_register (plugin, "bin", GST_RANK_PRIMARY, if (!gst_element_register (plugin, "bin", GST_RANK_PRIMARY,
GST_TYPE_BIN)); GST_TYPE_BIN) ||
g_assert (gst_element_register (plugin, "pipeline", GST_RANK_PRIMARY, !gst_element_register (plugin, "pipeline", GST_RANK_PRIMARY,
GST_TYPE_PIPELINE)); GST_TYPE_PIPELINE) ||
g_assert (gst_element_register (plugin, "thread", GST_RANK_PRIMARY, !gst_element_register (plugin, "thread", GST_RANK_PRIMARY,
GST_TYPE_THREAD)); GST_TYPE_THREAD) ||
g_assert (gst_element_register (plugin, "queue", GST_RANK_PRIMARY, !gst_element_register (plugin, "queue", GST_RANK_PRIMARY, GST_TYPE_QUEUE))
GST_TYPE_QUEUE)); g_assert_not_reached ();
return TRUE; return TRUE;
} }

9
gst/gstinfo.c
View file

@ -1107,8 +1107,17 @@ _gst_info_printf_extension_arginfo (const struct printf_info *info, size_t n,
} }
#endif /* HAVE_PRINTF_EXTENSION */ #endif /* HAVE_PRINTF_EXTENSION */
#else /* !GST_DISABLE_GST_DEBUG */
gboolean
__gst_in_valgrind (void)
{
return FALSE;
}
#endif /* GST_DISABLE_GST_DEBUG */ #endif /* GST_DISABLE_GST_DEBUG */
#ifdef GST_ENABLE_FUNC_INSTRUMENTATION #ifdef GST_ENABLE_FUNC_INSTRUMENTATION
/* FIXME make this thread specific */ /* FIXME make this thread specific */
static GSList *stack_trace = NULL; static GSList *stack_trace = NULL;