projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36597cf
)
splitmuxsink: Fix deadlock case when source reaches EOS
author
Xavier Claessens
<xavier.claessens@collabora.com>
Wed, 4 May 2016 15:15:20 +0000
(11:15 -0400)
committer
Jan Schmidt
<jan@centricular.com>
Wed, 4 May 2016 15:22:10 +0000
(
01:22
+1000)
https://bugzilla.gnome.org/show_bug.cgi?id=765072
gst/multifile/gstsplitmuxsink.c
patch
|
blob
|
history
diff --git
a/gst/multifile/gstsplitmuxsink.c
b/gst/multifile/gstsplitmuxsink.c
index f3b4df1c77477e5716f976f00c977f752742a5da..4e8da80216b0d4ef5a58966e143538fbfc431bd9 100644
(file)
--- a/
gst/multifile/gstsplitmuxsink.c
+++ b/
gst/multifile/gstsplitmuxsink.c
@@
-942,6
+942,11
@@
check_completed_gop (GstSplitMuxSink * splitmux, MqStreamCtx * ctx)
}
}
+ /* If upstream reached EOS we are not expecting more data, no need to wait
+ * here. */
+ if (ctx->in_eos)
+ return;
+
/* Some pad is not yet ready, or GOP is being pushed
* either way, sleep and wait to get woken */
current_max_in_running_time = splitmux->max_in_running_time;