summaryrefslogtreecommitdiff
path: root/gst/multifile
diff options
context:
space:
mode:
authorJan Schmidt <jan@centricular.com>2016-08-03 03:32:07 +1000
committerJan Schmidt <jan@centricular.com>2016-08-06 01:41:06 +1000
commit69df65fabe6d7bfeba9afa5a60cc061b8639b80f (patch)
treea106efeb3783c756e0c737da1439e47932c8798b /gst/multifile
parent7f0381fdd9a5690b231d83567eb6418a78a08bc7 (diff)
splitmuxsrc: Don't stop and error on EOS flow return
Don't immediately halt on EOS flow return from downstream due to out of segment. Let the demuxer handle it and send EOS.
Diffstat (limited to 'gst/multifile')
-rw-r--r--gst/multifile/gstsplitmuxsrc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/multifile/gstsplitmuxsrc.c b/gst/multifile/gstsplitmuxsrc.c
index c55db9fc7..a37433baa 100644
--- a/gst/multifile/gstsplitmuxsrc.c
+++ b/gst/multifile/gstsplitmuxsrc.c
@@ -544,11 +544,11 @@ gst_splitmux_pad_loop (GstPad * pad)
} else {
GstBuffer *buf = (GstBuffer *) (item->object);
GstFlowReturn ret = gst_splitmux_handle_buffer (splitmux, splitpad, buf);
- if (G_UNLIKELY (ret != GST_FLOW_OK)) {
+ if (G_UNLIKELY (ret != GST_FLOW_OK && ret != GST_FLOW_EOS)) {
/* Stop immediately on error or flushing */
GST_INFO_OBJECT (splitpad, "Stopping due to pad_push() result %d", ret);
gst_pad_pause_task (pad);
- if (ret <= GST_FLOW_EOS) {
+ if (ret < GST_FLOW_EOS) {
const gchar *reason = gst_flow_get_name (ret);
GST_ELEMENT_ERROR (splitmux, STREAM, FAILED,
(_("Internal data flow error.")),