summaryrefslogtreecommitdiff
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu.duponchelle@opencreed.com>2017-04-07 18:49:52 +0200
committerMathieu Duponchelle <mathieu.duponchelle@opencreed.com>2017-04-07 18:55:54 +0200
commit4d63aee36cbab5891eedb2c8004a1d1de2e55610 (patch)
tree13dfdbf72d52f7f5d0f0ad727db37de464193a9d /gst-libs/gst
parent75acc1afad2fbe0b95cddff1ec1ac6ed3972ca6e (diff)
downloadgstreamer-plugins-bad-4d63aee36cbab5891eedb2c8004a1d1de2e55610.tar.gz
videoaggregator: Do not mix the same buffer twice when EOS.
When entering this code path, we know that: We received EOS on this pad. We consumed all its buffers. In any case, we want to replace vaggpad->buffer with NULL, otherwise we will end up mixing the same buffer twice. https://bugzilla.gnome.org/show_bug.cgi?id=781037
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/video/gstvideoaggregator.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 2abb4d569..e17c111d4 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -1268,7 +1268,9 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
} else if (is_eos) {
eos = FALSE;
}
- } else if (is_eos) {
+ }
+
+ if (is_eos) {
gst_buffer_replace (&pad->buffer, NULL);
}
}