| Message ID | 20240922184045.52337-1-nil-admirari@mailo.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] Use the correct Vulkan NULL type | expand |
| Context | Check | Description |
|---|---|---|
| andriy/commit_msg_x86 | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| yinshiyou/commit_msg_loongarch64 | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 22/09/2024 20:40, nihil-admirari via ffmpeg-devel wrote: > 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 */ Thanks for sending the patch. 2bcc124e1a49e27b6a42b1d0ab1cac23568c3ca2, addressed this in a neater way, so I merged it instead of these 2 patches.
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 */
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(-)