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:
c5797b0
)
shmsink: Don't block on EOS in non-blocking mode
author
Olivier Crête
<olivier.crete@collabora.co.uk>
Tue, 3 Nov 2009 21:31:37 +0000
(16:31 -0500)
committer
Olivier Crête
<olivier.crete@collabora.co.uk>
Thu, 3 Jun 2010 19:27:41 +0000
(15:27 -0400)
gst/shm/gstshmsink.c
patch
|
blob
|
history
diff --git
a/gst/shm/gstshmsink.c
b/gst/shm/gstshmsink.c
index
9a0233b
..
2423512
100644
(file)
--- a/
gst/shm/gstshmsink.c
+++ b/
gst/shm/gstshmsink.c
@@
-542,7
+542,8
@@
gst_shm_sink_event (GstBaseSink * bsink, GstEvent * event)
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:
GST_OBJECT_LOCK (self);
- while (sp_writer_pending_writes (self->pipe) && !self->unlock)
+ while (self->wait_for_connection && sp_writer_pending_writes (self->pipe)
+ && !self->unlock)
g_cond_wait (self->cond, GST_OBJECT_GET_LOCK (self));
GST_OBJECT_UNLOCK (self);
break;