[ffmpeg] branch master updated (991ba3fbac -> eea648ef1d)
This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from 991ba3fbac avcodec/qsvdec: fix refcount leak in two-stage QSV init new 0a8b915b04 avcodec/vulkan_decode: fix logic error when checking for encode support new 20ac8c3688 avfilter/vulkan_filter: fix logic error when checking for encode support new eea648ef1d avutil/hwcontext_vulkan: fix logic error when checking for encode support The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libavcodec/vulkan_decode.c | 8 ++++---- libavfilter/vulkan_filter.c | 4 ++-- libavutil/hwcontext_vulkan.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
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 <kasper93@gmail.com> AuthorDate: Wed Dec 31 02:56:18 2025 +0100 Commit: Lynne <dev@lynne.ee> 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 <kasper93@gmail.com> --- 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; }
This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. commit 20ac8c36880914321b5a1a6616374e84dd07429c Author: Kacper Michajłow <kasper93@gmail.com> AuthorDate: Wed Dec 31 02:58:58 2025 +0100 Commit: Lynne <dev@lynne.ee> CommitDate: Wed Dec 31 10:30:36 2025 +0000 avfilter/vulkan_filter: 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 <kasper93@gmail.com> --- libavfilter/vulkan_filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vulkan_filter.c b/libavfilter/vulkan_filter.c index a9f47741ed..e049efec03 100644 --- a/libavfilter/vulkan_filter.c +++ b/libavfilter/vulkan_filter.c @@ -74,8 +74,8 @@ int ff_vk_filter_init_context(AVFilterContext *avctx, FFVulkanContext *s, /* If format supports hardware encoding, make sure * the context includes it. */ if (vk_frames->format[1] == VK_FORMAT_UNDEFINED && - (s->extensions & (FF_VK_EXT_VIDEO_ENCODE_QUEUE | - FF_VK_EXT_VIDEO_MAINTENANCE_1))) { + (s->extensions & FF_VK_EXT_VIDEO_ENCODE_QUEUE) && + (s->extensions & FF_VK_EXT_VIDEO_MAINTENANCE_1)) { VkFormatProperties3 fprops = { .sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3, };
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 <kasper93@gmail.com> AuthorDate: Wed Dec 31 03:00:14 2025 +0100 Commit: Lynne <dev@lynne.ee> 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 <kasper93@gmail.com> --- 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) {
participants (2)
-
ffmpeg-git -
Kacper Michajłow