ffmpeg | branch: master | Lynne <d...@lynne.ee> | Thu Jun 12 00:17:01 2025 +0900| [922a1ca98955487df983a8ebe3e2b545f9f18de8] | committer: Lynne
vulkan: maintain compatibility with older headers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=922a1ca98955487df983a8ebe3e2b545f9f18de8 --- libavutil/hwcontext_vulkan.c | 4 ++-- libavutil/vulkan.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 51be0c0d3b..64c17280b7 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -2836,7 +2836,7 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) VK_IMAGE_USAGE_SAMPLED_BIT); if (p->vkctx.extensions & FF_VK_EXT_HOST_IMAGE_COPY) - hwctx->usage |= supported_usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT; + hwctx->usage |= supported_usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT; /* Enables encoding of images, if supported by format and extensions */ if ((supported_usage & VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR) && @@ -4311,7 +4311,7 @@ static int vulkan_transfer_frame(AVHWFramesContext *hwfc, if (swf->width > hwfc->width || swf->height > hwfc->height) return AVERROR(EINVAL); - if (hwctx->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT) + if (hwctx->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT) return vulkan_transfer_host(hwfc, hwf, swf, upload); for (int i = 0; i < av_pix_fmt_count_planes(swf->format); i++) { diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 015a109b60..d0504064ed 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -108,7 +108,7 @@ const char *ff_vk_ret2str(VkResult res) MAP_TO(VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR, \ VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR); \ MAP_TO(VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT, \ - VK_IMAGE_USAGE_HOST_TRANSFER_BIT); \ + VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT); \ return dst; \ } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
