[FFmpeg-devel] [PATCH] Use the correct Vulkan NULL type
Lynne
dev at lynne.ee
Mon Sep 23 14:46:54 EEST 2024
On 22/09/2024 20:40, nihil-admirari via ffmpeg-devel wrote:
> From: nihil-admirari <50202386+nihil-admirari at 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 */
Thanks for sending the patch.
2bcc124e1a49e27b6a42b1d0ab1cac23568c3ca2, addressed this in a neater
way, so I merged it instead of these 2 patches.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0xA2FEA5F03F034464.asc
Type: application/pgp-keys
Size: 624 bytes
Desc: OpenPGP public key
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20240923/fdb041ed/attachment.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 236 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20240923/fdb041ed/attachment.sig>
More information about the ffmpeg-devel
mailing list