From f1472b4ed2a7874a696376b6c8b335444613ede7 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 3 Aug 2004 14:29:31 +0000 Subject: [PATCH] gst/schedulers/entryscheduler.c: fix for GST_DISABLE_DEBUG Original commit message from CVS: * gst/schedulers/entryscheduler.c: (gst_entry_scheduler_remove_element): fix for GST_DISABLE_DEBUG * tools/gst-launch.c: (print_tag): fixes for G_DISABLE_ASSERT --- ChangeLog | 8 ++++++++ gst/schedulers/entryscheduler.c | 4 +--- tools/gst-launch.c | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ad7781316..7c57d5c25e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-08-03 Benjamin Otte + + * gst/schedulers/entryscheduler.c: + (gst_entry_scheduler_remove_element): + fix for GST_DISABLE_DEBUG + * tools/gst-launch.c: (print_tag): + fixes for G_DISABLE_ASSERT + 2004-08-03 Benjamin Otte * gst/gst.c: (gst_register_core_elements): diff --git a/gst/schedulers/entryscheduler.c b/gst/schedulers/entryscheduler.c index 9f1db2f924..491b962954 100644 --- a/gst/schedulers/entryscheduler.c +++ b/gst/schedulers/entryscheduler.c @@ -873,10 +873,8 @@ static void gst_entry_scheduler_remove_element (GstScheduler * scheduler, GstElement * element) { - GstEntryScheduler *sched = GST_ENTRY_SCHEDULER (scheduler); - if (GST_FLAG_IS_SET (element, GST_ELEMENT_DECOUPLED)) { - GST_INFO_OBJECT (sched, "decoupled element %s added, ignoring", + GST_INFO_OBJECT (scheduler, "decoupled element %s added, ignoring", GST_OBJECT_NAME (element)); return; } diff --git a/tools/gst-launch.c b/tools/gst-launch.c index 82f401d973..256618efc4 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -292,7 +292,8 @@ print_tag (const GstTagList * list, const gchar * tag, gpointer unused) gchar *str; if (gst_tag_get_type (tag) == G_TYPE_STRING) { - g_assert (gst_tag_list_get_string_index (list, tag, i, &str)); + if (!gst_tag_list_get_string_index (list, tag, i, &str)) + g_assert_not_reached (); } else { str = g_strdup_value_contents (gst_tag_list_get_value_index (list, tag, i));