From 83929a5849b0ff6da73cb3369e2aa21b624f3f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sun, 13 Jun 2010 18:05:41 +0200
Subject: [PATCH] basesink: Make sure we have a valid object to render in
 _render_object()

---
 libs/gst/base/gstbasesink.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 51f09f75cf..0d9739683f 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -2673,7 +2673,6 @@ gst_base_sink_render_object (GstBaseSink * basesink, GstPad * pad,
   GstBaseSinkClass *bclass;
   gboolean late, step_end;
   gpointer sync_obj;
-
   GstBaseSinkPrivate *priv;
 
   priv = basesink->priv;
@@ -2749,7 +2748,7 @@ again:
 
       priv->rendered++;
     }
-  } else {
+  } else if (G_LIKELY (GST_IS_EVENT (obj))) {
     GstEvent *event = GST_EVENT_CAST (obj);
     gboolean event_res = TRUE;
     GstEventType type;
@@ -2813,6 +2812,8 @@ again:
           break;
       }
     }
+  } else {
+    g_return_val_if_reached (GST_FLOW_ERROR);
   }
 
 done: