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:
086f885
)
queue2: fix merge error
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 11 Apr 2012 11:20:18 +0000
(13:20 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Wed, 11 Apr 2012 11:20:18 +0000
(13:20 +0200)
plugins/elements/gstqueue2.c
patch
|
blob
|
history
diff --git
a/plugins/elements/gstqueue2.c
b/plugins/elements/gstqueue2.c
index
8132d80
..
82e2e11
100644
(file)
--- a/
plugins/elements/gstqueue2.c
+++ b/
plugins/elements/gstqueue2.c
@@
-661,7
+661,7
@@
apply_segment (GstQueue2 * queue, GstEvent * event, GstSegment * segment,
gst_event_copy_segment (event, segment);
if (segment->format == GST_FORMAT_BYTES) {
- if (!QUEUE_IS_USING_QUEUE (queue)) {
+ if (!QUEUE_IS_USING_QUEUE (queue)
&& is_sink
) {
/* start is where we'll be getting from and as such writing next */
queue->current = add_range (queue, segment->start);
}