diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 22:04:38 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-12-18 22:04:38 +0100 |
| commit | 30ce523d59eda36753a87ee01df1a079216fbb4d (patch) | |
| tree | d750366acac32f25118f759522102c77037920a4 /gst-libs/gst/video | |
| parent | af46a58caec4d47d2a19418b96f80c1af8e637af (diff) | |
| download | gstreamer-plugins-bad-30ce523d59eda36753a87ee01df1a079216fbb4d.tar.gz | |
videoaggregator: Don't try to map NULL buffers
Diffstat (limited to 'gst-libs/gst/video')
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 9a6374a78..023c3926b 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"); |