summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-11-28 10:04:38 +0200
committerSebastian Dröge <sebastian@centricular.com>2016-11-28 12:38:10 +0200
commitd291f6b07e3240d9bc5af5a70e98c23f7624b1a3 (patch)
treebb09fc3c1c0d85334361d633ba1f4b95bb267dde
parent01c8982d01201286f1bcda7b46500390a7c9b3b7 (diff)
downloadgstreamer-plugins-base-d291f6b07e3240d9bc5af5a70e98c23f7624b1a3.tar.gz
discoverer: Also stop waiting for subtitles if we get EOS
We're not going to get a buffer or GAP event anymore after EOS and would wait forever otherwise.
-rw-r--r--gst-libs/gst/pbutils/gstdiscoverer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gst-libs/gst/pbutils/gstdiscoverer.c b/gst-libs/gst/pbutils/gstdiscoverer.c
index 6018a56c5..9dfc50ae7 100644
--- a/gst-libs/gst/pbutils/gstdiscoverer.c
+++ b/gst-libs/gst/pbutils/gstdiscoverer.c
@@ -549,7 +549,9 @@ got_subtitle_data (GstPad * pad, GstPadProbeInfo * info, GstDiscoverer * dc)
{
if (!(GST_IS_BUFFER (info->data) || (GST_IS_EVENT (info->data)
- && GST_EVENT_TYPE ((GstEvent *) info->data) == GST_EVENT_GAP)))
+ && (GST_EVENT_TYPE ((GstEvent *) info->data) == GST_EVENT_GAP
+ || GST_EVENT_TYPE ((GstEvent *) info->data) ==
+ GST_EVENT_EOS))))
return GST_PAD_PROBE_OK;