diff options
| author | Memphiz <memphis@machzwo.de> | 2013-06-17 22:25:59 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-06-17 22:25:59 +0200 |
| commit | 6a5c12ebdfe96acf01b9c42d4b123e1372b39b95 (patch) | |
| tree | 2deeddb936d5416346e3833a73c550c9e534331b /lib/ffmpeg | |
| parent | 7e42adf710187062b8ecf44a9ac2036a1f5474be (diff) | |
Revert "ffmpeg: fixup compile error in patch"
This reverts commit fcbc5e9a2a320c0b3bb6d6555143e863f1db3158.
Diffstat (limited to 'lib/ffmpeg')
| -rw-r--r-- | lib/ffmpeg/libavcodec/vaapi.c | 2 | ||||
| -rw-r--r-- | lib/ffmpeg/patches/0038-vaapi-don-t-unmap-non-existing-buffer.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ffmpeg/libavcodec/vaapi.c b/lib/ffmpeg/libavcodec/vaapi.c index 3e203d66c5..b991cde782 100644 --- a/lib/ffmpeg/libavcodec/vaapi.c +++ b/lib/ffmpeg/libavcodec/vaapi.c @@ -46,7 +46,7 @@ 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) { + if (vactx->pic_param_buf_id) vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id); va_buffers[n_va_buffers++] = vactx->pic_param_buf_id; } 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 index 0724a861f4..e1549d6a26 100644 --- 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 @@ -18,7 +18,7 @@ index a220a9d..b991cde 100644 VABufferID va_buffers[3]; unsigned int n_va_buffers = 0; -+ if (vactx->pic_param_buf_id) { ++ if (vactx->pic_param_buf_id) vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id); va_buffers[n_va_buffers++] = vactx->pic_param_buf_id; + } |