From 30ce523d59eda36753a87ee01df1a079216fbb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 18 Dec 2014 22:04:38 +0100
Subject: [PATCH] videoaggregator: Don't try to map NULL buffers
---
gst-libs/gst/video/gstvideoaggregator.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index 9a6374a7883..023c3926b60 100644
--- a/gst-libs/gst/video/gstvideoaggregator.c
+++ b/gst-libs/gst/video/gstvideoaggregator.c
@@ -226,9 +226,14 @@ gst_video_aggregator_pad_prepare_frame (GstVideoAggregatorPad * pad,
guint outsize;
GstVideoFrame *converted_frame;
GstBuffer *converted_buf = NULL;
- GstVideoFrame *frame = g_slice_new0 (GstVideoFrame);
+ GstVideoFrame *frame;
static GstAllocationParams params = { 0, 15, 0, 0, };
+ if (!pad->buffer)
+ return TRUE;
+
+ frame = g_slice_new0 (GstVideoFrame);
+
if (!gst_video_frame_map (frame, &pad->buffer_vinfo, pad->buffer,
GST_MAP_READ)) {
GST_WARNING_OBJECT (vagg, "Could not map input buffer");