This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 0a8b915b04f34ad40437812939d33b50d8137526 Author: Kacper Michajłow <[email protected]> AuthorDate: Wed Dec 31 02:56:18 2025 +0100 Commit: Lynne <[email protected]> CommitDate: Wed Dec 31 10:30:36 2025 +0000 avcodec/vulkan_decode: 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]> --- libavcodec/vulkan_decode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index eb76d5b052..5ed963eacc 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -1054,8 +1054,8 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; - if (ctx->s.extensions & (FF_VK_EXT_VIDEO_ENCODE_QUEUE | - FF_VK_EXT_VIDEO_MAINTENANCE_1)) + if ((ctx->s.extensions & FF_VK_EXT_VIDEO_ENCODE_QUEUE) && + (ctx->s.extensions & FF_VK_EXT_VIDEO_MAINTENANCE_1)) fmt_info.imageUsage |= VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR; } @@ -1229,8 +1229,8 @@ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx) hwfc->usage |= VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR; ctx = dec->shared_ctx; - if (ctx->s.extensions & (FF_VK_EXT_VIDEO_ENCODE_QUEUE | - FF_VK_EXT_VIDEO_MAINTENANCE_1)) + if ((ctx->s.extensions & FF_VK_EXT_VIDEO_ENCODE_QUEUE) && + (ctx->s.extensions & FF_VK_EXT_VIDEO_MAINTENANCE_1)) hwfc->usage |= VK_IMAGE_USAGE_VIDEO_ENCODE_SRC_BIT_KHR; } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
