diff options
| author | Sam James <sam@gentoo.org> | 2023-12-20 12:32:43 +0000 |
|---|---|---|
| committer | Lynne <dev@lynne.ee> | 2024-01-06 22:38:55 +0100 |
| commit | 2f24f10d9cf34ddce274496c4daa73f732d370c1 (patch) | |
| tree | 233175f86d4bc6f4be494c6bf262d6e9dc90874f /libavcodec | |
| parent | 9109273e3ba406afa74bce38217cddcd9be75b7c (diff) | |
| download | ffmpeg-2f24f10d9cf34ddce274496c4daa73f732d370c1.tar.gz | |
libavcodec: fix -Wint-conversion in vulkan
FIx warnings (soon to be errors in GCC 14, already so in Clang 15):
```
src/libavcodec/vulkan_av1.c: In function ‘vk_av1_create_params’:
src/libavcodec/vulkan_av1.c:183:43: error: initialization of ‘long long unsigned int’ from ‘void *’ makes integer from pointer without a cast [-Wint-conversion]
183 | .videoSessionParametersTemplate = NULL,
| ^~~~
src/libavcodec/vulkan_av1.c:183:43: note: (near initialization for ‘(anonymous).videoSessionParametersTemplate’)
```
Use Vulkan's VK_NULL_HANDLE instead of bare NULL.
Fix Trac ticket #10724.
Was reported downstream in Gentoo at https://bugs.gentoo.org/919067.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vulkan_av1.c | 2 | ||||
| -rw-r--r-- | libavcodec/vulkan_decode.c | 6 | ||||
| -rw-r--r-- | libavcodec/vulkan_h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/vulkan_hevc.c | 2 | ||||
| -rw-r--r-- | libavcodec/vulkan_video.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index 4998bf7ebc..9730e4b08d 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -180,7 +180,7 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &av1_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create); diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index a89d84fcaa..fdbcbb450a 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -188,9 +188,9 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic, return 0; vkpic->dpb_frame = NULL; - vkpic->img_view_ref = NULL; - vkpic->img_view_out = NULL; - vkpic->img_view_dest = NULL; + vkpic->img_view_ref = VK_NULL_HANDLE; + vkpic->img_view_out = VK_NULL_HANDLE; + vkpic->img_view_dest = VK_NULL_HANDLE; vkpic->destroy_image_view = vk->DestroyImageView; vkpic->wait_semaphores = vk->WaitSemaphores; diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index e727aafb16..39c123ddca 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -315,7 +315,7 @@ static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &h264_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; /* SPS list */ diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c index 99fdcf3b45..033172cbd6 100644 --- a/libavcodec/vulkan_hevc.c +++ b/libavcodec/vulkan_hevc.c @@ -653,7 +653,7 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf) .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, .pNext = &h265_params, .videoSession = ctx->common.session, - .videoSessionParametersTemplate = NULL, + .videoSessionParametersTemplate = VK_NULL_HANDLE, }; HEVCHeaderSet *hdr; diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index 5fa8292b28..fb20315db4 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -287,7 +287,7 @@ av_cold void ff_vk_video_common_uninit(FFVulkanContext *s, if (common->session) { vk->DestroyVideoSessionKHR(s->hwctx->act_dev, common->session, s->hwctx->alloc); - common->session = NULL; + common->session = VK_NULL_HANDLE; } if (common->nb_mem && common->mem) |