summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorBen Browitt <ben.browitt@gmail.com>2015-08-20 14:11:56 +0300
committerSebastian Dröge <sebastian@centricular.com>2015-08-20 14:22:49 +0300
commit09b4f050e04203ece28add79d419910801072ef7 (patch)
tree41bb0b89c505c4b832f274e75f1f3a43c650b2d9 /gst-libs
parent551e7b97f31fc5a0bd7c545b4cd8258d18da512a (diff)
downloadgstreamer-plugins-bad-09b4f050e04203ece28add79d419910801072ef7.tar.gz
videoaggregator: Always set the pad's buffer_vinfo when storing a buffer
Otherwise it might be unset, and then the buffer is used and gst_video_frame_map() will crash because of invalid video-info. https://bugzilla.gnome.org/show_bug.cgi?id=753805
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/video/gstvideoaggregator.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index b8d29eeb9..fe41e022f 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -1025,6 +1025,7 @@ gst_videoaggregator_fill_queues (GstVideoAggregator * vagg,
GST_DEBUG_OBJECT (pad, "buffer duration is -1, start_time < "
"output_start_time. Discarding old buffer");
gst_buffer_replace (&pad->buffer, buf);
+ pad->buffer_vinfo = *vinfo;
gst_buffer_unref (buf);
gst_aggregator_pad_drop_buffer (bpad);
need_more_data = TRUE;