diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-06-30 17:30:34 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-07-04 12:47:28 +0200 |
| commit | a85b7a2b896e948fd2e239b6394fbcea1841297b (patch) | |
| tree | 83bdcad60bac10910f5991c13e2fbe6a2fcf3d94 | |
| parent | 7921dc34b869fe24ac6f3d8dc3e349e280b400ab (diff) | |
| download | gstreamer-plugins-base-a85b7a2b896e948fd2e239b6394fbcea1841297b.tar.gz | |
tagdemux: fix erroring out if we reach EOS without detecting type
In 0.10 the source pad was a dynamic pad that was only added once
the type had been detected, but in 1.x it's an always source pad,
so checking whether it's still NULL won't work to detect if the
type has been detected.
Makes tagdemux error out when we get EOS but haven't managed to
identify the format of the data after the tag.
https://bugzilla.gnome.org//show_bug.cgi?id=768178
| -rw-r--r-- | gst-libs/gst/tag/gsttagdemux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c index b736276c1..f4c7f0e5d 100644 --- a/gst-libs/gst/tag/gsttagdemux.c +++ b/gst-libs/gst/tag/gsttagdemux.c @@ -761,8 +761,7 @@ gst_tag_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) switch (GST_EVENT_TYPE (event)) { case GST_EVENT_EOS: - /* FIXME, detect this differently */ - if (demux->priv->srcpad == NULL) { + if (!gst_pad_has_current_caps (demux->priv->srcpad)) { GST_WARNING_OBJECT (demux, "EOS before we found a type"); GST_ELEMENT_ERROR (demux, STREAM, TYPE_NOT_FOUND, (NULL), (NULL)); } |