From patchwork Sun Sep 22 18:48:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nihil-admirari X-Patchwork-Id: 51704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2088496vqb; Sun, 22 Sep 2024 11:59:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgaT0lgaTpqDdOn0evBOw7RSDi/9cTHRXoYLZD/bampBImO+lg4hCOIIDybFw2BVIgBxmZYX29J4u8fPE11h0g@gmail.com X-Google-Smtp-Source: AGHT+IFsKpsY/5+vvB5gPhDa8SmsXp9l9hcLvrX3Vev5SSE8dqgePyy1IbHl6KXXUyCmfu6LpC/V X-Received: by 2002:a17:907:94d4:b0:a8b:6ee7:ba1b with SMTP id a640c23a62f3a-a90d56d8d57mr980367166b.15.1727031557543; Sun, 22 Sep 2024 11:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727031557; cv=none; d=google.com; s=arc-20240605; b=cJcpufEdLRd4o9HmZhAYmHcHXSnVGZHtXnF+JIIKHri5cVpEskjSiKsKIBvRcGIGaC /VHK6Y5A9tQ5UVsB8tCUHAWCIpCjv1MMYjdMsWDKcQDWwmPuIFebI6/Y9XbFiPP9htgO hO2vLEwLHoEhyZ/x+qvLt07qLcWZcdy+3Vmu0j0IGz5CLFZYyChl5OvsrihN0OzX8z7/ f2U252+Wfb4X7qrI/FMM8Pix1djwVECZ0lOTwU3OmnOoPj55ssBM1SIvtUfjN0eqw+RY /Dulr+/x1uShdxznqUyHViTroLoz9ENANvuifZ4oYjJRHfUs0rPb5OXO9GvLpEAQtpuc G59g== 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=Kkf2tNWrcWJ/wNiDDwvxINyJMPmkS4DaH8fB2gD+pGMGWpPZKQ8lkdZJ3OnAi0qx3l D/h3aFkByLDXXFNKJZ+JesWL5VTUOghTyeTO6qGLxD6vRvn2S1J8Hn9fwyEEFpNd8elU j8+YX6btFxg0RRyOaIQKFzC5ZWDwahhdhM5kIDi+OkXcQept8B+haFb18x8nfFj7w5Xx g8J8P7dpxEhDnxRgYiKTril0UZFvNGxp8RwxLMcp572dl7HyIUqwRmY6ooe8eKQiazs1 A+p78tHWaJk3EO2LZJC4HxM50Oc5+n6q6z5EPBxIqVkZSA93bI46Pbxa4RpqbqjD7gPS 3tkw==; 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 a640c23a62f3a-a9061372493si1306994666b.937.2024.09.22.11.59.16; Sun, 22 Sep 2024 11:59:17 -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 4AD7268C548; Sun, 22 Sep 2024 21:49:18 +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 3B0FC68AA0C for ; Sun, 22 Sep 2024 21:49:11 +0300 (EEST) Received: by b221-8.in.mailobj.net [192.168.90.28] with ESMTP via ip-20.mailobj.net [213.182.54.20] Sun, 22 Sep 2024 20:49:09 +0200 (CEST) X-EA-Auth: jLGwlJqyfs13No22ixToArK0mo9wtIBDnte+/rYVB6+oreEvpm0X6GEOLfdJNSnO9jYBWBoZh5Iu/b9RUisa9ZwwMJcfKOZxQjZzQwCMVBI= To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2024 21:48:52 +0300 Message-ID: <20240922184857.55013-1-nil-admirari@mailo.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/vulkan_encode: 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: a07GwZRiUL0P 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 */