generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vaapi: return early from ff_vaapi_render_picture() without picture

Browse Source 
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 2ee380aefb)
This commit is contained in:
Janne Grunau
2013-06-18 01:56:06 +02:00
committed by Carl Eugen Hoyos
parent e22dd7fbd0
commit 054779625f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vaapi.c
View File

@@ -46,6 +46,9 @@ int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
VABufferID va_buffers[3]; VABufferID va_buffers[3];
unsigned int n_va_buffers = 0; unsigned int n_va_buffers = 0;
if (!vactx->pic_param_buf_id)
return 0;
vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id); vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id);
va_buffers[n_va_buffers++] = vactx->pic_param_buf_id; va_buffers[n_va_buffers++] = vactx->pic_param_buf_id;