From patchwork Sun Sep 22 18:40:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nihil-admirari X-Patchwork-Id: 51703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2083751vqb; Sun, 22 Sep 2024 11:41:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUqemk98BSI+dYebkgcgUZioTJyzAHV1HAROfmN2LLZnshuxB90mqGwuR8ozFAelq6B28kHBuB8vXMTayo1/RmL@gmail.com X-Google-Smtp-Source: AGHT+IETiBuXn8YoG/sDKQwInhw5U4D9hhwX9d45vwLR/DguAq+beJHdss0wSiQ0m4faiFlqalyp X-Received: by 2002:a2e:4602:0:b0:2f3:f168:f91 with SMTP id 38308e7fff4ca-2f7cc3655cdmr35977821fa.11.1727030466285; Sun, 22 Sep 2024 11:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727030466; cv=none; d=google.com; s=arc-20240605; b=AMcJpC2pdlkUoyx0WrmW4jh9O31hxELa+SkmOz89XBtdfDm486yJ+oJ1u4xhfOtXcf 7YDfDIzQrEtGkmR6XJZjG6sR9HKvK7dcWYvGBfgSRfqOAkkh5YpEJs0fDah334KsT9oM gmTV6mmaAN5r+wWHrQfpyXz6rV3s6Ki9qAhg17nfXEWob9Q32UNvUq4m7vT9lMoTIjQ2 rGfWrBAHpY9EuSfDmuRi7fVMqVTjSaEgV7+01DcCTdSpcKKTk94VP8l/ioN6JbNyf5ht t8qvDI1nbPJ1+869BQMNpnrLqcQ+J8qwh10IjFCRVBEzsZP1tNHOaCq5LAF4146e5qBU rOTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to :delivered-to; bh=Oa+FZrldYxh8BgvGAuIVpscfY7JSewXBjB/D6Ftv+lc=; fh=wnDxOnZeWxl5EBFnRpjjUtN6AE08iitN5zhIQEh2daA=; b=G26aWNSbO5CFgXbLNY3UTlA+wxa3aF2gj8hIjyV0ADFD0lKBtKupQWUR2trjB0OFdL uc3PF4QNn0DusvYxYG4yfurtd8Lmtd4s/eMn1E9cpYPURgyQpAC9xFh+bk6ngr9DGA/C ODiPOb5JuZJrsAZkCaknhLnKWGlaAMnPulPC1sW181abx8+WmORqIB/5KtoRRlRahOMK W3zpY+cXWuTpRAS0ZROnCh+ElOYiv8hx6X31xz/RdXsHnOpRWiTCEd1VgJbK/WJB/VMl deRUk7Tjz01jX77IHgx87KT7givoUAXXKV3Wy+fcyfF33qr8EQE8HuIIdD5kzwBKiT60 bNSQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 38308e7fff4ca-2f79d47b576si57328521fa.527.2024.09.22.11.41.05; Sun, 22 Sep 2024 11:41:06 -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; 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 31ABE68DA6E; Sun, 22 Sep 2024 21:41:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailo.com (msg-2.mailo.com [213.182.54.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 736A468CA9D for ; Sun, 22 Sep 2024 21:40:55 +0300 (EEST) Received: by b221-5.in.mailobj.net [192.168.90.25] with ESMTP via ip-20.mailobj.net [213.182.54.20] Sun, 22 Sep 2024 20:40:54 +0200 (CEST) X-EA-Auth: 2+HJq7PIW8f+3ht0TUsDD1f5v7XawpnkN+2LIlO1CspFSFWvNBHiBJah5G8QhLi3w/e6PKC0+AiFoc7TYaftcRKH10mbimFR2fK3RXi/4f0= To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2024 21:40:45 +0300 Message-ID: <20240922184045.52337-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Use the correct Vulkan NULL type 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: , X-Patchwork-Original-From: nihil-admirari via ffmpeg-devel From: nihil-admirari Reply-To: FFmpeg development discussions and patches Cc: nihil-admirari Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PuEyQ2nIALGt From: nihil-admirari <50202386+nihil-admirari@users.noreply.github.com> Fixes build issue for Win32 targets --- libavcodec/vulkan_encode_h264.c | 2 +- libavcodec/vulkan_encode_h265.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c index af229af..a67e177 100644 --- a/libavcodec/vulkan_encode_h264.c +++ b/libavcodec/vulkan_encode_h264.c @@ -1048,7 +1048,7 @@ static int create_session_params(AVCodecContext *avctx) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &h264_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; /* Create session parameters */ diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c index 3cb7a3b..2082cec 100644 --- a/libavcodec/vulkan_encode_h265.c +++ b/libavcodec/vulkan_encode_h265.c @@ -1201,7 +1201,7 @@ static int create_session_params(AVCodecContext *avctx) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &h265_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; /* Create session parameters */