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 10:04:38 +0200
commitbd74b102fa9bebb58b8a7e476e12e43e6502fcc0 (patch)
tree85770f2e0723462a0a7ef0be1ea221740b5b7228
parent0846eb5b27567aeadfc1d15c737a4083a7f0beee (diff)
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 ff7947161..dcd6f703e 100644
--- a/gst-libs/gst/pbutils/gstdiscoverer.c
+++ b/gst-libs/gst/pbutils/gstdiscoverer.c
@@ -548,7 +548,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;