From 2ee380aefbb92c89e8e9c7aa5846aa404919ec7c Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-libav@jannau.net>
Date: Tue, 18 Jun 2013 01:56:06 +0200
Subject: [PATCH] vaapi: return early from ff_vaapi_render_picture() without
picture
Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.
Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
---
libavcodec/vaapi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index a220a9d3c21..94959bf5edf 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -46,6 +46,9 @@ int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
VABufferID va_buffers[3];
unsigned int n_va_buffers = 0;
+ if (!vactx->pic_param_buf_id)
+ return 0;
+
vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id);
va_buffers[n_va_buffers++] = vactx->pic_param_buf_id;
--
GitLab