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:
213cd27
)
Revert "videomixer: When all sinkpads are eos, update output segment stop and forward it"
author
Sebastian Dröge
<slomo@circular-chaos.org>
Wed, 12 Jun 2013 16:23:46 +0000
(18:23 +0200)
committer
Sebastian Dröge
<slomo@circular-chaos.org>
Wed, 12 Jun 2013 16:25:59 +0000
(18:25 +0200)
This reverts commit
2d3910fc7901b5f29e16c0fdd4e9067a6d7f66fe
.
It's not solving any problem and instead causes code to fall apart.
https://bugzilla.gnome.org/show_bug.cgi?id=701519
gst/videomixer/videomixer2.c
patch
|
blob
|
history
diff --git
a/gst/videomixer/videomixer2.c
b/gst/videomixer/videomixer2.c
index
ae85097
..
90f9196
100644
(file)
--- a/
gst/videomixer/videomixer2.c
+++ b/
gst/videomixer/videomixer2.c
@@
-1024,11
+1024,8
@@
gst_videomixer2_collected (GstCollectPads * pads, GstVideoMixer2 * mix)
ret = GST_FLOW_OK;
goto done;
} else if (res == -1) {
- GST_DEBUG_OBJECT (mix, "All sinkpads are EOS -- forwarding");
-
- mix->segment.stop = output_end_time;
GST_VIDEO_MIXER2_UNLOCK (mix);
-
gst_pad_push_event (mix->srcpad, gst_event_new_segment (&mix->segment)
);
+
GST_DEBUG_OBJECT (mix, "All sinkpads are EOS -- forwarding"
);
gst_pad_push_event (mix->srcpad, gst_event_new_eos ());
ret = GST_FLOW_EOS;
goto done_unlocked;