[FFmpeg-cvslog] hwcontext_vaapi: Fix condition for DRM device derivation

Mark Thompson git at videolan.org
Sun Mar 18 19:56:37 EET 2018


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sun Mar 11 21:16:25 2018 +0000| [389f4c3e0d0a26a7d3d2696017384874cf5e93fa] | committer: Mark Thompson

hwcontext_vaapi: Fix condition for DRM device derivation

vaGetDisplayDRM() is required for this code to work, libdrm is not.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=389f4c3e0d0a26a7d3d2696017384874cf5e93fa
---

 libavutil/hwcontext_vaapi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index af9a136ef0..99f76b9169 100644
--- 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_LIBDRM
+#if HAVE_VAAPI_DRM
     if (src_ctx->type == AV_HWDEVICE_TYPE_DRM) {
         AVDRMDeviceContext *src_hwctx = src_ctx->hwctx;
         VADisplay *display;



More information about the ffmpeg-cvslog mailing list