From 38d398448a97eee11ecb9a5c7290686ec20d132f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 8 Mar 2012 10:32:02 +0100
Subject: [PATCH] baseparse: Fix merge mistake

---
 libs/gst/base/gstbaseparse.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
index 3e14b16832..e309704517 100644
--- a/libs/gst/base/gstbaseparse.c
+++ b/libs/gst/base/gstbaseparse.c
@@ -476,15 +476,12 @@ gst_base_parse_clear_queues (GstBaseParse * parse)
   g_list_free (parse->priv->pending_events);
   parse->priv->pending_events = NULL;
   parse->priv->pending_segment = FALSE;
-
-  gst_event_replace (&parse->priv->close_segment, NULL);
 }
 
 static void
 gst_base_parse_finalize (GObject * object)
 {
   GstBaseParse *parse = GST_BASE_PARSE (object);
-  GstEvent **p_ev;
 
   g_object_unref (parse->priv->adapter);
 
@@ -750,8 +747,6 @@ gst_base_parse_reset (GstBaseParse * parse)
   parse->priv->pending_events = NULL;
   parse->priv->pending_segment = FALSE;
 
-  gst_event_replace (&parse->priv->close_segment, NULL);
-
   if (parse->priv->cache) {
     gst_buffer_unref (parse->priv->cache);
     parse->priv->cache = NULL;
@@ -1987,14 +1982,6 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
     gst_base_parse_check_media (parse);
   }
 
-  /* and should then also be linked downstream, so safe to send some events */
-  if (G_UNLIKELY (parse->priv->close_segment)) {
-    /* only set up by loop */
-    GST_DEBUG_OBJECT (parse, "loop sending close segment");
-    gst_pad_push_event (parse->srcpad, parse->priv->close_segment);
-    parse->priv->close_segment = NULL;
-  }
-
   /* Push pending events, including NEWSEGMENT events */
   if (G_UNLIKELY (parse->priv->pending_events)) {
     GList *l;