Commit d33e6ca8 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

gst-libs/gst/tag/gsttagdemux.c: Don't abort with an assertion if we receive a...

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).
parent d3f29fa6
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> 2007-10-22 Wim Taymans <wim.taymans@gmail.com>
* sys/ximage/ximagesink.c: (gst_ximagesink_event_thread), * sys/ximage/ximagesink.c: (gst_ximagesink_event_thread),
...@@ -752,8 +752,10 @@ gst_tag_demux_get_upstream_size (GstTagDemux * tagdemux) ...@@ -752,8 +752,10 @@ gst_tag_demux_get_upstream_size (GstTagDemux * tagdemux)
static gboolean static gboolean
gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event) gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
{ {
GstTagDemux *tagdemux;
gboolean res = FALSE; 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. */ /* Handle SEEK events, with adjusted byte offsets and sizes. */
...@@ -789,8 +791,8 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event) ...@@ -789,8 +791,8 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
cur = 0; cur = 0;
cur -= tagdemux->priv->strip_end; cur -= tagdemux->priv->strip_end;
break; break;
case GST_SEEK_TYPE_NONE:
default: default:
g_assert_not_reached ();
break; break;
} }
switch (stop_type) { switch (stop_type) {
...@@ -809,6 +811,7 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event) ...@@ -809,6 +811,7 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
stop = 0; stop = 0;
stop -= tagdemux->priv->strip_end; stop -= tagdemux->priv->strip_end;
break; break;
case GST_SEEK_TYPE_NONE:
default: default:
break; break;
} }
...@@ -819,9 +822,11 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event) ...@@ -819,9 +822,11 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
break; break;
} }
default: default:
/* FIXME: shouldn't we pass unknown and unhandled events upstream? */
break; break;
} }
gst_object_unref (tagdemux);
gst_event_unref (event); gst_event_unref (event);
return res; return res;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment