[ffmpeg] - backport fix for crashing when using vaapi (found on libav…

… mailing list) - this was signed off by elupus
xbmc · Jun 17, 2013 · 2e8f569 · 2e8f569
1 parent b746531
commit 2e8f569
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/lib/ffmpeg/libavcodec/vaapi.c b/lib/ffmpeg/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;
 

diff --git a/...tches/0038-backport-vaapi-return-early-from-ff_vaapi_render_picture-without-picture.patch b/...tches/0038-backport-vaapi-return-early-from-ff_vaapi_render_picture-without-picture.patch
@@ -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/lib/ffmpeg/libavcodec/vaapi.c b/lib/ffmpeg/libavcodec/vaapi.c
+index a220a9d..94959bf 100644
+--- a/lib/ffmpeg/libavcodec/vaapi.c
++++ b/lib/ffmpeg/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;
+