Skip to content
This repository
Browse code

Revert "ffmpeg: add patch file for vaapi fix"

This reverts commit 4f47cfc.
  • Loading branch information...
commit b74653197bfdd302313f8499ef0fca264ad84ef7 1 parent 4b316e6
Memphiz authored June 17, 2013
30  lib/ffmpeg/patches/0038-vaapi-don-t-unmap-non-existing-buffer.patch
... ...
@@ -1,30 +0,0 @@
1  
-From 28f92dfbd59197955f95a583a61a24428048f166 Mon Sep 17 00:00:00 2001
2  
-From: Joakim Plate <elupus@ecce.se>
3  
-Date: Wed, 22 May 2013 22:24:07 +0200
4  
-Subject: [PATCH 1/2] vaapi: don't unmap non-existing buffer
5  
-
6  
-Some h264's can end up calling ff_vaapi_render_picture after a seek
7  
-with no buffer allocated and vaUnmapBuffer will assert on a invalid
8  
-buffer.
9  
----
10  
- libavcodec/vaapi.c | 2 ++
11  
- 1 file changed, 2 insertions(+)
12  
-
13  
-diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
14  
-index a220a9d..b991cde 100644
15  
---- a/libavcodec/vaapi.c
16  
-+++ b/libavcodec/vaapi.c
17  
-@@ -46,8 +46,10 @@ int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
18  
-     VABufferID va_buffers[3];
19  
-     unsigned int n_va_buffers = 0;
20  
- 
21  
-+    if (vactx->pic_param_buf_id)
22  
-     vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id);
23  
-     va_buffers[n_va_buffers++] = vactx->pic_param_buf_id;
24  
-+    }
25  
- 
26  
-     if (vactx->iq_matrix_buf_id) {
27  
-         vaUnmapBuffer(vactx->display, vactx->iq_matrix_buf_id);
28  
--- 
29  
-1.8.2
30  
-

0 notes on commit b746531

Please sign in to comment.
Something went wrong with that request. Please try again.