From: Matthew Waters <ystreet00@gmail.com>
Date: Mon, 23 Jun 2014 12:40:23 +0000 (+1000)
Subject: videoaggregator: don't clobber already heap allocated video frame
X-Git-Tag: 1.16.2~260^2~364
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe79c90fc162158c38827b04bc188d83ae7ad2a4;p=platform%2Fupstream%2Fgst-plugins-base.git

videoaggregator: don't clobber already heap allocated video frame

CID # 1223440
---

diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 583e540..6010a52 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;