From 8f716555ba1a958ae9a1f83beba7df22c94a6faa Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 23 Jun 2014 22:40:23 +1000 Subject: [PATCH] videoaggregator: don't clobber already heap allocated video frame CID # 1223440 --- gst-libs/gst/video/gstvideoaggregator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 583e540b20..6010a52f55 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -1011,7 +1011,7 @@ prepare_frames (GstVideoAggregator * vagg, GstVideoAggregatorPad * pad) GstClockTime timestamp; gint64 stream_time; GstSegment *seg; - GstVideoFrame *converted_frame = g_slice_new0 (GstVideoFrame); + GstVideoFrame *converted_frame; GstBuffer *converted_buf = NULL; GstVideoFrame *frame = g_slice_new0 (GstVideoFrame); @@ -1034,6 +1034,8 @@ prepare_frames (GstVideoAggregator * vagg, GstVideoAggregatorPad * pad) if (pad->priv->convert) { gint converted_size; + converted_frame = g_slice_new0 (GstVideoFrame); + /* We wait until here to set the conversion infos, in case vagg->info changed */ if (pad->need_conversion_update) { pad->conversion_info = vagg->info;