This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit eea648ef1d16f0081ea35595339ab533890056e6 Author: Kacper Michajłow <[email protected]> AuthorDate: Wed Dec 31 03:00:14 2025 +0100 Commit: Lynne <[email protected]> CommitDate: Wed Dec 31 10:30:36 2025 +0000 avutil/hwcontext_vulkan: fix logic error when checking for encode support Both FF_VK_EXT_VIDEO_ENCODE_QUEUE and FF_VK_EXT_VIDEO_MAINTENANCE_1 are required, not only one of them. Found by VVL. Signed-off-by: Kacper Michajłow <[email protected]> --- libavutil/hwcontext_vulkan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 2011cdec79..706af35287 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -3025,8 +3025,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) /* Enables encoding of images, if supported by format and extensions */ if ((supported_usage & VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR) && - (p->vkctx.extensions & (FF_VK_EXT_VIDEO_ENCODE_QUEUE | - FF_VK_EXT_VIDEO_MAINTENANCE_1))) + (p->vkctx.extensions & FF_VK_EXT_VIDEO_ENCODE_QUEUE) && + (p->vkctx.extensions & FF_VK_EXT_VIDEO_MAINTENANCE_1)) hwctx->usage |= VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR; /* Image creation flags. @@ -3049,8 +3049,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) * If there's no profile list, or it has no encode operations, * then allow creating the image with no specific profile. */ if ((hwctx->usage & VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR) && - (p->vkctx.extensions & (FF_VK_EXT_VIDEO_ENCODE_QUEUE | - FF_VK_EXT_VIDEO_MAINTENANCE_1))) { + (p->vkctx.extensions & FF_VK_EXT_VIDEO_ENCODE_QUEUE) && + (p->vkctx.extensions & FF_VK_EXT_VIDEO_MAINTENANCE_1)) { const VkVideoProfileListInfoKHR *pl; pl = ff_vk_find_struct(hwctx->create_pnext, VK_STRUCTURE_TYPE_VIDEO_PROFILE_LIST_INFO_KHR); if (!pl) { _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
