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 6A06F43BA9 for ; Wed, 20 Jul 2022 10:57:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F10168B62B; Wed, 20 Jul 2022 13:56:59 +0300 (EEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F61068B4F7 for ; Wed, 20 Jul 2022 13:56:51 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id bv24so1706499wrb.3 for ; Wed, 20 Jul 2022 03:56:51 -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=NiISEWjCvxMmLjbGtLQbTWOOWWCDJ7ixm39d5/O4k+E=; b=Kevl734FUHeQsPfkxWJylZbr4nKsB/JKQk4d64rOgdYSmGmW3pv3WdSH2RmDzefEVr 2un/j2soUCuINiZ/So7CDSsOvwUoDA3Ajp0p7hbTu6lSQHhWtdnpjsEqaNhcVpoajaWX zuA2fGPz7Js9j4/B0jhEox5bYbKGiLM1g/t+Nse0Rqg8oWhr3Fdgr/kgLuG9Mo6G1UMu swqi3wsf+erGqDLCngSA9rgJ5yJrC/E3/rV8T7ahTEZSxMW7XahlshGUj7PNe4hsVS4O J33XHhY1goQSuQVCgDTi1FfRhuwxxWtS51jbNrtelWeXgbjzdnQJ2ERY3ublnYVdhU4f FC+Q== 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=NiISEWjCvxMmLjbGtLQbTWOOWWCDJ7ixm39d5/O4k+E=; b=0HYj1hIPdYCB+erSSxdHL0uPmAftAS1/E9pQlHCgAIV+Pj9ZNgEpDbb+Uhc0r5tRjo VeBFo6mPuhybdNJNAz5lv/vse6HvqZEcJW2SYBRYI5osnxTGyM5XT6Ydi86Cf0IUAYHm GgRIY1Bo4DJ2nAB5owxOCi7xgnKy3TZ1BLGKg4Oz039PTbDTdJYREUKsWte1jqzp4E/H +sCux2gfe/jrDvRezRBpWgDF2Id82ulOgij/Ee/dAzG6l6gessKs7DHO3NYFRveMQJCT kOi/Mrwoyk8yP6UTmMKAJ1pnkbDgfbx9pF2gLX4iS8J+8dqwzHsacaIMBCm27aVy9MIV Pe1g== X-Gm-Message-State: AJIora8XQzo5JrXLoGkcJ4UlgnxWxhw0vUViRzhVGsli3KM96cXYyXs7 4tsrgmqOIiwk3Nmq0eydoz6fcmlJs55dFQ== X-Google-Smtp-Source: AGRyM1vGYF/4Gl0DPmlp7SbKHAXv7M18iYi0P/M0NwBbNPV5rEmWI3JH1Gb8+AalHr7hknuSb9D2oA== X-Received: by 2002:adf:f3c7:0:b0:21d:9349:7a5 with SMTP id g7-20020adff3c7000000b0021d934907a5mr30292325wrp.23.1658314610190; Wed, 20 Jul 2022 03:56:50 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:a792:c012:897f:7da6]) by smtp.gmail.com with UTF8SMTPSA id b16-20020a056000055000b0021e2fccea97sm4415927wrf.64.2022.07.20.03.56.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jul 2022 03:56:49 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 11:56:46 +0100 Message-Id: <20220720105646.716398-4-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220720105646.716398-1-emil.l.velikov@gmail.com> References: <20220720105646.716398-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 a compiler guard. 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".