From patchwork Sun Mar 11 22:41:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 7919 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp973988jad; Sun, 11 Mar 2018 15:42:14 -0700 (PDT) X-Google-Smtp-Source: AG47ELuTbchQPIys8o5TwzWhFuWEb9CsfdXunw6bo3ou50BswJ54bZnbWxgX3vQVToIjYLAfts84 X-Received: by 10.28.130.9 with SMTP id e9mr3709026wmd.161.1520808134505; Sun, 11 Mar 2018 15:42:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520808134; cv=none; d=google.com; s=arc-20160816; b=tC37m97RsmHnqswjPfIhioaT6mkxtFUNXyxRVOc+xDwEp/1Pug8VNtkaX1GdHYKdUk 4x3p6AfwwYXxjdcYms55gSyMKb7zMA4bPYh70gL+oyffm6Jdkf3yJEMrs2rQwGBEJ+G/ i4UAQPnhJFS0xUMvS+waLLLlpfnEiNnDBe9HUydwC4AzGciq08ARQRdeN3kk8/lait34 p8pWvSAUKImoXs6jo9iULFxUevoZD9mfQgBMbhP0GC77sDUlGZyvAIuv+i10BrKaowte IYjDjmAYiXRwKdBMWzfNu4zsWb4646uS6dAg54PZU5SSLBd/xJ6bRl7wXmwHKwV4VdZF zzcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=dNEO0nN5GjS0Z1W/41r/z7IcAXFpt9FGtMfxHAZhTrM=; b=i0qVe1S9W75VRgKRs/U0Q7T+pt9nNeykTQuw5yR0C5qKJubjglopj5N2Wcz23723L8 d7oCZJfDu6yCwXlRHWNXDkx+QwO7y91A6BhBCWAd4sdN7J/3EmzYx/QgvZVV2q0XC1mu tsHMadqhPEPvcs/rnimtqVpY+Uua8/+1s+H39MS7d55c6axflr9aNhPCirv0bX+WmktJ EwuvH1yZd/azHJhxk36zNeSZIfEmQk/8xKBDSc9E+5mf9Nm5lm9mjNuKTLdZx7xcncsk p0ul//iJ3dC/vHkZkJTroBdXJANhJTlTouF9yqRAefYT/B+DV7ncr4pLbVkkjckZKwqM 9h1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=Yjy6+0S5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j189si2350639wmb.20.2018.03.11.15.42.13; Sun, 11 Mar 2018 15:42:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=Yjy6+0S5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24311689DBE; Mon, 12 Mar 2018 00:42:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A45F1689C47 for ; Mon, 12 Mar 2018 00:41:54 +0200 (EET) Received: by mail-wm0-f47.google.com with SMTP id 188so12716899wme.1 for ; Sun, 11 Mar 2018 15:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=9G0Hew6lewkgw7io7v8zVNnyaPMoPZiPCfAGstY0gJc=; b=Yjy6+0S5SHkVFYKQ7hz0/PaxDwiB7xWJj9hbNY6sFppyH49CqVRaU7eV/PPg5ukVux tZsMcuP9nHALVQEAw5p5NdrwRuEB0y54dFStPrFFx3dq58io6eUamx/I1gpB4sR0LTBl Yk1rAyQvfBGzG9N90WV6HUy6CYSDRUOS1YkvGmFMB7aW67JRDbqTvRSwEwr2fmKTK0f1 sSBwyvhUVvnSEPRDunkvIgDZDtPRtZffH7QaKmIop1Ex+jfw+o7jvAERbfTa+f4hyzoh WLvxe5RXquXMRxDsbfOBruN3HYB9Xj+rLr52WB7q5PdFIHkD6zmNyDYpBGemUX2frAV2 aH5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=9G0Hew6lewkgw7io7v8zVNnyaPMoPZiPCfAGstY0gJc=; b=kgZPETIqSUtX9mHuMn+t85PT+ygHwcJUF5BNoLRDjbhTLUjXrYTfbuN+SBKG6MjWmo M4XWDS85qyX42rnkaOYW9HZIi50b84xjMQbHb24tDeGP6+enTAwrZ0hWs3zmNpkt/mZg a8Q6K0BIDkBtn1AY5zeI7QmfkOnTWfKqbeC4faXdmPErJsNPgSj+QyYbOp8/gHH1+qjb MTXH1v7//jo4P08aUkd/0LF023ZlXT3kSMR2qmP8sg4kfI2YSTMjSaJKN5Zw17eRN+q/ IDB+fCdL30fDNrlFWzkxGDmMe4SeRakTGEbq3L+C2JFxaHMd85JQXlv87c3yZkYijkQT l6QA== X-Gm-Message-State: AElRT7EpKOOmaNbHywYOW117sEicpXK0UyF3aff91aQ3t/PoCOIpp9s9 /+4Jnyv65DOlOHfsHqdobpY7mMLB X-Received: by 10.28.195.133 with SMTP id t127mr3866058wmf.156.1520808124027; Sun, 11 Mar 2018 15:42:04 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id d5sm5317163wma.18.2018.03.11.15.42.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 15:42:03 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 22:41:50 +0000 Message-Id: <20180311224156.23986-1-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH 1/7] hwcontext_vaapi: Fix condition for DRM device derivation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" vaGetDisplayDRM() is required for this code to work, libdrm is not. --- 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;