diff options
| author | Memphiz <memphis@machzwo.de> | 2013-06-17 22:31:28 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-06-17 22:31:28 +0200 |
| commit | b74653197bfdd302313f8499ef0fca264ad84ef7 (patch) | |
| tree | 761e072d9485788938703a377f39f76f350cbc2b | |
| parent | 4b316e65cd0440ae25238ac5cce5c4dd3fccd16a (diff) | |
Revert "ffmpeg: add patch file for vaapi fix"
This reverts commit 4f47cfc9726c46ee69c72bdc4a28c15f1caea342.
| -rw-r--r-- | lib/ffmpeg/patches/0038-vaapi-don-t-unmap-non-existing-buffer.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/lib/ffmpeg/patches/0038-vaapi-don-t-unmap-non-existing-buffer.patch b/lib/ffmpeg/patches/0038-vaapi-don-t-unmap-non-existing-buffer.patch deleted file mode 100644 index e1549d6a26..0000000000 --- a/lib/ffmpeg/patches/0038-vaapi-don-t-unmap-non-existing-buffer.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 28f92dfbd59197955f95a583a61a24428048f166 Mon Sep 17 00:00:00 2001 -From: Joakim Plate <elupus@ecce.se> -Date: Wed, 22 May 2013 22:24:07 +0200 -Subject: [PATCH 1/2] vaapi: don't unmap non-existing buffer - -Some h264's can end up calling ff_vaapi_render_picture after a seek -with no buffer allocated and vaUnmapBuffer will assert on a invalid -buffer. ---- - libavcodec/vaapi.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c -index a220a9d..b991cde 100644 ---- a/libavcodec/vaapi.c -+++ b/libavcodec/vaapi.c -@@ -46,8 +46,10 @@ 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) - vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id); - va_buffers[n_va_buffers++] = vactx->pic_param_buf_id; -+ } - - if (vactx->iq_matrix_buf_id) { - vaUnmapBuffer(vactx->display, vactx->iq_matrix_buf_id); --- -1.8.2 - |