From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 41A3C43B72 for ; Tue, 19 Jul 2022 16:57:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3C0B68B6F9; Tue, 19 Jul 2022 19:57:02 +0300 (EEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67B8668B6F9 for ; Tue, 19 Jul 2022 19:57:00 +0300 (EEST) Received: by mail-wm1-f43.google.com with SMTP id ay11-20020a05600c1e0b00b003a3013da120so10408352wmb.5 for ; Tue, 19 Jul 2022 09:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D+cwfkj3FyHmCse3ahY4CIezdr+uKa0BE8y8V5Ed0kU=; b=c93XtwvbFR3frUnB7G872F+OHOIQdeciuCzUV2sYLHkeuo8dqxHt7nQY5+pS8JM8fR lriVXecSnXiuigWSjTeQphIuyhnSyNNum8PmdtPqjdPoahZP8O/64OlpieQQIyd7GOfP T+aTbyEw5VlSnO94mliF+3AiFxuZuuNnVZFlOsXKPtvBd3nadBgBMX4CaiK9NcDshQMi SiKgvzaMTISDFj8bvq1Y9xwOFBUSHXLKYJzGFnqJRQHVozHxFQNkMhVL9XifF4JARd68 hhtoKvmy+LNyHZZbmfBtNMU1Wbtj1Gp+6E7j0rHsqu8qGrAIdoAy13Th4XB+tBzxwPv3 EXqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D+cwfkj3FyHmCse3ahY4CIezdr+uKa0BE8y8V5Ed0kU=; b=nASgIM4Jd3n7nplK/QdFdZsOTYb0KKop0Dl9gZ5WhXU+X2pSfMrR5ozHvYIXg4NViE SPOba/NUmaTJP7WZb72XtSHuc47TXlR0HI1Jvnq/9LK439ORL94gApw/i+QUKBq9pffr FEwVWvUmIhk7zUakveqsaeFiHY+XlZXkW7HeOvoNrO7cq/if7O2UbayTl8yaOSQR2wq1 6Nz7oBQDT/A86WdGO/kF6r0DLlFioVyPzaXlJzYAHPP0zkuAcGKHm/QPAH7IHVzajdLn nmWc7G38hpPHKqLomEK225XmEhwrfSPEzAShRkqqIEbYdLM69ZKIcHQSK64Ts5PY/yOx cwjA== X-Gm-Message-State: AJIora+qSdZ7wcbM7mevTX35r60A6SYZ78kgT0gqdn+9+bboadhF+v7Y BDA9wCWUPNlpDMgeU1zzq72iE9uPG5Y6Cw== X-Google-Smtp-Source: AGRyM1vZgUwkP9hs1SAaEgxD1Qq9g3hOovarZa231t6Qh4RX9BkjWIczxc/7JQ2S67gycFx3i5j5SQ== X-Received: by 2002:a05:600c:3b91:b0:3a3:1cbe:d531 with SMTP id n17-20020a05600c3b9100b003a31cbed531mr202266wms.159.1658249819434; Tue, 19 Jul 2022 09:56:59 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:ed02:7072:7dbf:2431]) by smtp.gmail.com with UTF8SMTPSA id bd20-20020a05600c1f1400b003a3211112f8sm3833068wmb.46.2022.07.19.09.56.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jul 2022 09:56:59 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Jul 2022 17:56:56 +0100 Message-Id: <20220719165656.640869-4-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220719165656.640869-1-emil.l.velikov@gmail.com> References: <20220719165656.640869-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] hwcontext_vaapi: #if guard VAAPI_DRM specifics X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Mark Thompson , emil.l.velikov@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Emil Velikov Similar to the VAAPI_X11 bits, guard all the VAAPI_DRM parts behind an disabled. Cc: Mark Thompson Signed-off-by: Emil Velikov --- libavutil/hwcontext_vaapi.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 7734a50fc0..7aea3e7b96 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -18,6 +18,10 @@ #include "config.h" +#if !HAVE_VAAPI_X11 && !HAVE_VAAPI_DRM +#error "At least one VAAPI winsys is required X11 or DRM" +#endif + #if CONFIG_VAAPI_1 # define VA_ABI ".2" #else @@ -68,8 +72,10 @@ typedef struct VAAPIDevicePriv { Display *x11_display; #endif +#if HAVE_VAAPI_DRM void *libva_drm; int drm_fd; +#endif } VAAPIDevicePriv; typedef struct VAAPISurfaceFormat { @@ -1583,10 +1589,12 @@ static void vaapi_device_free(AVHWDeviceContext *ctx) XCloseDisplay(priv->x11_display); #endif +#if HAVE_VAAPI_DRM if (priv->drm_fd >= 0) close(priv->drm_fd); if (priv->libva_drm) dlclose(priv->libva_drm); +#endif av_freep(&priv); } @@ -1645,7 +1653,9 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, if (!priv) return AVERROR(ENOMEM); +#if HAVE_VAAPI_DRM priv->drm_fd = -1; +#endif ctx->user_opaque = priv; ctx->free = vaapi_device_free; -- 2.37.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".