mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-25 16:48:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseparse: Fix merge mistake

Browse source
This commit is contained in:
Sebastian Dröge 2012-03-08 10:32:02 +01:00
parent 6b4091a30d
commit 38d398448a
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/gst/base/gstbaseparse.c
View file

@ -476,15 +476,12 @@ gst_base_parse_clear_queues (GstBaseParse * parse)
g_list_free (parse->priv->pending_events); g_list_free (parse->priv->pending_events);
parse->priv->pending_events = NULL; parse->priv->pending_events = NULL;
parse->priv->pending_segment = FALSE; parse->priv->pending_segment = FALSE;
gst_event_replace (&parse->priv->close_segment, NULL);
} }
static void static void
gst_base_parse_finalize (GObject * object) gst_base_parse_finalize (GObject * object)
{ {
GstBaseParse *parse = GST_BASE_PARSE (object); GstBaseParse *parse = GST_BASE_PARSE (object);
GstEvent **p_ev;
g_object_unref (parse->priv->adapter); g_object_unref (parse->priv->adapter);
@ -750,8 +747,6 @@ gst_base_parse_reset (GstBaseParse * parse)
parse->priv->pending_events = NULL; parse->priv->pending_events = NULL;
parse->priv->pending_segment = FALSE; parse->priv->pending_segment = FALSE;
gst_event_replace (&parse->priv->close_segment, NULL);
if (parse->priv->cache) { if (parse->priv->cache) {
gst_buffer_unref (parse->priv->cache); gst_buffer_unref (parse->priv->cache);
parse->priv->cache = NULL; parse->priv->cache = NULL;
@ -1987,14 +1982,6 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
gst_base_parse_check_media (parse); 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 */ /* Push pending events, including NEWSEGMENT events */
if (G_UNLIKELY (parse->priv->pending_events)) { if (G_UNLIKELY (parse->priv->pending_events)) {
GList *l; GList *l;