git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84bb832
)
hwcontext_vaapi: Fix condition for DRM device derivation
author
Mark Thompson
<sw@jkqxz.net>
Sun, 11 Mar 2018 21:16:25 +0000
(21:16 +0000)
committer
Mark Thompson
<sw@jkqxz.net>
Sun, 18 Mar 2018 17:55:00 +0000
(17:55 +0000)
vaGetDisplayDRM() is required for this code to work, libdrm is not.
libavutil/hwcontext_vaapi.c
patch
|
blob
|
history
diff --git
a/libavutil/hwcontext_vaapi.c
b/libavutil/hwcontext_vaapi.c
index
af9a136
..
99f76b9
100644
(file)
--- a/
libavutil/hwcontext_vaapi.c
+++ b/
libavutil/hwcontext_vaapi.c
@@
-1324,7
+1324,7
@@
static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
static int vaapi_device_derive(AVHWDeviceContext *ctx,
AVHWDeviceContext *src_ctx, int flags)
{
-#if
CONFIG_LIB
DRM
+#if
HAVE_VAAPI_
DRM
if (src_ctx->type == AV_HWDEVICE_TYPE_DRM) {
AVDRMDeviceContext *src_hwctx = src_ctx->hwctx;
VADisplay *display;