gst/schedulers/gstoptimalscheduler.c

Original commit message from CVS:
* gst/schedulers/gstoptimalscheduler.c
(gst_opt_scheduler_pad_unlink): Check if element is non-NULL and
really is a GstElement. Avoids critical when running gst-launch -v
and a oggdemux/decoding pipeline.

diff --git a/ChangeLog b/ChangeLog
index fd5898880fdea0781e89536f9b0fecbd9212b1d8..e678567c6916282db38a401602825eca0782a312 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-03  Johan Dahlin  <johan@gnome.org>
+
+       * gst/schedulers/gstoptimalscheduler.c
+       (gst_opt_scheduler_pad_unlink): Check if element is non-NULL and
+       really is a GstElement. Avoids critical when running gst-launch -v
+       and a oggdemux/decoding pipeline.
+
 2004-05-02  Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
 
        * docs/gst/tmpl/gstpipeline.sgml :

diff --git a/gst/schedulers/gstoptimalscheduler.c b/gst/schedulers/gstoptimalscheduler.c
index d58ab63b207fab4f7864ab5719e958281110dec1..cb927bfaba050b4aff8eef06ff42220808cd4109 100644 (file)
--- a/gst/schedulers/gstoptimalscheduler.c
+++ b/gst/schedulers/gstoptimalscheduler.c
@@ -2186,7 +2186,8 @@ gst_opt_scheduler_pad_unlink (GstScheduler * sched,
         for (l = group->elements; l && l->data; l = l->next) {
           GstElement *element = (GstElement *) l->data;
 
-          if (GST_ELEMENT_IS_DECOUPLED (element))
+          if (!element || !GST_IS_ELEMENT (element) ||
+              GST_ELEMENT_IS_DECOUPLED (element))
             continue;
 
           linkcount = 0;