mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-08-18 19:37:39 +02:00
commit 135b41cb5b
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/matroska/matroska-demux.c
View file

@ -4340,6 +4340,20 @@ pause:
if (ret == GST_FLOW_UNEXPECTED) { if (ret == GST_FLOW_UNEXPECTED) {
/* perform EOS logic */ /* perform EOS logic */
/* If we were in the headers, make sure we send no-more-pads.
This will ensure decodebin2 does not get stuck thinking
the chain is not complete yet, and waiting indefinitely. */
if (G_UNLIKELY (demux->common.state == GST_MATROSKA_READ_STATE_HEADER)) {
if (demux->common.src->len == 0) {
GST_ELEMENT_ERROR (demux, STREAM, FAILED, (NULL),
("No pads created"));
} else {
GST_ELEMENT_WARNING (demux, STREAM, DEMUX, (NULL),
("Failed to finish reading headers"));
}
gst_element_no_more_pads (GST_ELEMENT (demux));
}
/* Close the segment, i.e. update segment stop with the duration /* Close the segment, i.e. update segment stop with the duration
* if no stop was set */ * if no stop was set */
if (GST_CLOCK_TIME_IS_VALID (demux->last_stop_end) && if (GST_CLOCK_TIME_IS_VALID (demux->last_stop_end) &&