From d30991ae039b3174c6529129b750d69d1aacc633 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 19 Apr 2004 23:08:03 +0000 Subject: [PATCH] gst/schedulers/entryscheduler.c: refuse to yield when decoupled elements insist on doing that. Original commit message from CVS: * gst/schedulers/entryscheduler.c: (gst_entry_scheduler_yield): refuse to yield when decoupled elements insist on doing that. At least it's better than crashing --- ChangeLog | 7 +++++++ gst/schedulers/entryscheduler.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d4e4383dbe..df9c24a632 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-20 Benjamin Otte + + * gst/schedulers/entryscheduler.c: + (gst_entry_scheduler_yield): + refuse to yield when decoupled elements insist on doing that. + At least it's better than crashing + 2004-04-19 David Schleef * docs/libs/Makefile.am: Change sinclude to include diff --git a/gst/schedulers/entryscheduler.c b/gst/schedulers/entryscheduler.c index 099ef0b551..d9dff85ccd 100644 --- a/gst/schedulers/entryscheduler.c +++ b/gst/schedulers/entryscheduler.c @@ -887,7 +887,10 @@ gst_entry_scheduler_state_transition (GstScheduler * scheduler, static gboolean gst_entry_scheduler_yield (GstScheduler * sched, GstElement * element) { - g_assert (ELEMENT_PRIVATE (element)); + /* g_assert (ELEMENT_PRIVATE (element)); */ + /* FIXME: queue thinks it may just interrupt, is that ok? */ + if (!ELEMENT_PRIVATE (element)) + return TRUE; ELEMENT_PRIVATE (element)->wait = WAIT_FOR_NOTHING; schedule_next_element (GST_ENTRY_SCHEDULER (sched)); return FALSE;