mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 03:01:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

adder: fix after merge

Browse source
This commit is contained in:
Wim Taymans 2011-08-17 10:47:20 +02:00
parent 33467d9629
commit 246622b1e8
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/adder/gstadder.c
View file

@ -729,9 +729,6 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
adder->segment.stop = end; adder->segment.stop = end;
else else
adder->segment.stop = GST_CLOCK_TIME_NONE; adder->segment.stop = GST_CLOCK_TIME_NONE;
/* make sure we push a new segment, to inform about new basetime
* see FIXME in gst_adder_collected() */
adder->segment_pending = TRUE;
if (flush) { if (flush) {
/* Yes, we need to call _set_flushing again *WHEN* the streaming threads /* Yes, we need to call _set_flushing again *WHEN* the streaming threads
* have stopped so that the cookie gets properly updated. */ * have stopped so that the cookie gets properly updated. */
@ -825,7 +822,7 @@ gst_adder_sink_event (GstPad * pad, GstEvent * event)
adder->pending_events = g_list_append (adder->pending_events, event); adder->pending_events = g_list_append (adder->pending_events, event);
GST_OBJECT_UNLOCK (adder->collect); GST_OBJECT_UNLOCK (adder->collect);
goto beach; goto beach;
case GST_EVENT_NEWSEGMENT: case GST_EVENT_SEGMENT:
if (g_atomic_int_compare_and_exchange (&adder->wait_for_new_segment, if (g_atomic_int_compare_and_exchange (&adder->wait_for_new_segment,
TRUE, FALSE)) { TRUE, FALSE)) {
/* make sure we push a new segment, to inform about new basetime /* make sure we push a new segment, to inform about new basetime