summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Crete <olivier.crete@collabora.co.uk>2008-05-15 01:22:57 +0000
committerEdward Hervey <bilboed@bilboed.com>2009-02-17 19:29:06 +0100
commit91dcd54ae5b2b6c9e2dde5a2de422555e2ef37d4 (patch)
tree2a51212fc7ef0f1a3719b6cf3ec6c329b73e57b6
parent4d44cf5fe2d405ded3168b5475e07754628f2040 (diff)
downloadgst-plugins-bad-91dcd54ae5b2b6c9e2dde5a2de422555e2ef37d4.tar.gz
gst-plugins-bad-91dcd54ae5b2b6c9e2dde5a2de422555e2ef37d4.tar.bz2
gst-plugins-bad-91dcd54ae5b2b6c9e2dde5a2de422555e2ef37d4.zip
[MOVED FROM GST-P-FARSIGHT] Reset vars before restarting thread on flush stop
20080515012257-3e2dc-e3521752cf3eaf2b8767f4c620eadfc24a8e8e31.gz
-rw-r--r--gst/liveadder/liveadder.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c
index 02af82cb..9d7353e3 100644
--- a/gst/liveadder/liveadder.c
+++ b/gst/liveadder/liveadder.c
@@ -536,12 +536,14 @@ gst_live_adder_sink_event (GstPad * pad, GstEvent * event)
ret = gst_pad_push_event (adder->srcpad, event);
break;
case GST_EVENT_FLUSH_STOP:
- ret = gst_pad_push_event (adder->srcpad, event);
- ret = gst_live_adder_src_activate_push (adder->srcpad, TRUE);
GST_OBJECT_LOCK (adder);
+ adder->segment_pending = TRUE;
+ adder->next_timestamp = GST_CLOCK_TIME_NONE;
reset_pad_private (pad);
adder->segment_pending = TRUE;
GST_OBJECT_UNLOCK (adder);
+ ret = gst_pad_push_event (adder->srcpad, event);
+ ret = gst_live_adder_src_activate_push (adder->srcpad, TRUE);
break;
case GST_EVENT_EOS:
{