mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
ffmpeg: update upstream patches
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
9381040a67
commit
513f5dcdd4
@ -0,0 +1,22 @@
|
||||
Subject: [libav-devel] [PATCH 1/2] vaapi: return early from ff_vaapi_render_picture() without picture
|
||||
From: Janne Grunau janne-libav at jannau.net
|
||||
|
||||
Fixes an assertion when called on uninitialized frame. Spotted after
|
||||
seeking in vlc. (backported from libav mailing list)
|
||||
|
||||
---
|
||||
|
||||
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
|
||||
index a220a9d..94959bf 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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user