mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
gst-libs/gst/tag/gsttagdemux.c: Don't abort with an assertion if we receive a seek event with a start type of NONE (s...
Original commit message from CVS: * gst-libs/gst/tag/gsttagdemux.c: Don't abort with an assertion if we receive a seek event with a start type of NONE (see launchpad bug #155878).
This commit is contained in:
parent
d3f29fa6e1
commit
d33e6ca818
2 changed files with 13 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-10-23 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst-libs/gst/tag/gsttagdemux.c:
|
||||
Don't abort with an assertion if we receive a seek event with
|
||||
a start type of NONE (see launchpad bug #155878).
|
||||
|
||||
2007-10-22 Wim Taymans <wim.taymans@gmail.com>
|
||||
|
||||
* sys/ximage/ximagesink.c: (gst_ximagesink_event_thread),
|
||||
|
|
|
@ -752,8 +752,10 @@ gst_tag_demux_get_upstream_size (GstTagDemux * tagdemux)
|
|||
static gboolean
|
||||
gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
|
||||
{
|
||||
GstTagDemux *tagdemux;
|
||||
gboolean res = FALSE;
|
||||
GstTagDemux *tagdemux = GST_TAG_DEMUX (GST_PAD_PARENT (pad));
|
||||
|
||||
tagdemux = GST_TAG_DEMUX (gst_pad_get_parent (pad));
|
||||
|
||||
/* Handle SEEK events, with adjusted byte offsets and sizes. */
|
||||
|
||||
|
@ -789,8 +791,8 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
|
|||
cur = 0;
|
||||
cur -= tagdemux->priv->strip_end;
|
||||
break;
|
||||
case GST_SEEK_TYPE_NONE:
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
}
|
||||
switch (stop_type) {
|
||||
|
@ -809,6 +811,7 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
|
|||
stop = 0;
|
||||
stop -= tagdemux->priv->strip_end;
|
||||
break;
|
||||
case GST_SEEK_TYPE_NONE:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -819,9 +822,11 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
|
|||
break;
|
||||
}
|
||||
default:
|
||||
/* FIXME: shouldn't we pass unknown and unhandled events upstream? */
|
||||
break;
|
||||
}
|
||||
|
||||
gst_object_unref (tagdemux);
|
||||
gst_event_unref (event);
|
||||
return res;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue