summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@collabora.com>2013-07-04 12:54:59 -0400
committerThibault Saunier <thibault.saunier@collabora.com>2013-07-04 22:10:13 -0400
commit38790e57574c14020e309578d680efd6359eeee8 (patch)
tree760de70f3ad0dc0deb96239d195bc8572887f144
parentcd00206059a398ea889621ea284642e2208a56e1 (diff)
adder: Do not send flush_start event with the stream lock taken
FLUSH_START is not serialized, so the lock should not be taken when sending it.
-rw-r--r--gst/adder/gstadder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index ca3c7e417..78f7c82a0 100644
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -834,10 +834,10 @@ gst_adder_sink_event (GstCollectPads * pads, GstCollectData * pad,
}
case GST_EVENT_FLUSH_START:
/* ensure that we will send a flush stop */
- GST_COLLECT_PADS_STREAM_LOCK (adder->collect);
- adder->flush_stop_pending = TRUE;
res = gst_collect_pads_event_default (pads, pad, event, discard);
event = NULL;
+ GST_COLLECT_PADS_STREAM_LOCK (adder->collect);
+ adder->flush_stop_pending = TRUE;
GST_COLLECT_PADS_STREAM_UNLOCK (adder->collect);
break;
case GST_EVENT_FLUSH_STOP: