vaapi: return early from ff_vaapi_render_picture() without picture
authorJanne Grunau <janne-libav@jannau.net>
Mon, 17 Jun 2013 23:56:06 +0000 (01:56 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 18 Jun 2013 00:12:18 +0000 (02:12 +0200)
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>
(cherry picked from commit 2ee380aefbb92c89e8e9c7aa5846aa404919ec7c)

libavcodec/vaapi.c

index a220a9d..94959bf 100644 (file)
@@ -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;