mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

discoverer: Ensure that we have fixed, non-empty caps before passing passing to is_subtitle_caps()

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/655>
This commit is contained in:
Sebastian Dröge 2020-05-06 11:44:39 +03:00
parent 350a7197e7
commit ceb705837d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/pbutils/gstdiscoverer.c
View file

@ -712,7 +712,8 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
if (sinkpad == NULL) if (sinkpad == NULL)
goto error; goto error;
if (is_subtitle_caps (caps)) { if (caps && !gst_caps_is_empty (caps) && !gst_caps_is_any (caps)
&& is_subtitle_caps (caps)) {
/* Subtitle streams are sparse and may not provide any information - don't /* Subtitle streams are sparse and may not provide any information - don't
* wait for data to preroll */ * wait for data to preroll */
ps->probe_id = ps->probe_id =
@ -722,6 +723,7 @@ uridecodebin_pad_added_cb (GstElement * uridecodebin, GstPad * pad,
dc->priv->pending_subtitle_pads++; dc->priv->pending_subtitle_pads++;
} }
if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);
gst_bin_add_many (dc->priv->pipeline, ps->queue, ps->sink, NULL); gst_bin_add_many (dc->priv->pipeline, ps->queue, ps->sink, NULL);