mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: don't clobber already heap allocated video frame

Browse source 
CID # 1223440
This commit is contained in:
Matthew Waters 2014-06-23 22:40:23 +10:00
parent 5ae625a333
commit fe79c90fc1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1011,7 +1011,7 @@ prepare_frames (GstVideoAggregator * vagg, GstVideoAggregatorPad * pad)
GstClockTime timestamp; GstClockTime timestamp;
gint64 stream_time; gint64 stream_time;
GstSegment *seg; GstSegment *seg;
GstVideoFrame *converted_frame = g_slice_new0 (GstVideoFrame); GstVideoFrame *converted_frame;
GstBuffer *converted_buf = NULL; GstBuffer *converted_buf = NULL;
GstVideoFrame *frame = g_slice_new0 (GstVideoFrame); GstVideoFrame *frame = g_slice_new0 (GstVideoFrame);
@ -1034,6 +1034,8 @@ prepare_frames (GstVideoAggregator * vagg, GstVideoAggregatorPad * pad)
if (pad->priv->convert) { if (pad->priv->convert) {
gint converted_size; gint converted_size;
converted_frame = g_slice_new0 (GstVideoFrame);
/* We wait until here to set the conversion infos, in case vagg->info changed */ /* We wait until here to set the conversion infos, in case vagg->info changed */
if (pad->need_conversion_update) { if (pad->need_conversion_update) {
pad->conversion_info = vagg->info; pad->conversion_info = vagg->info;