The branch, master has been updated
via 203c6a93d7851360aeb1011050a57cef5a832a6e (commit)
from 2452b81769b921ad4221bd24efbcfdbac22215ad (commit)
- Log -----------------------------------------------------------------
commit 203c6a93d7851360aeb1011050a57cef5a832a6e
Author: Niklas Haas <[email protected]>
AuthorDate: Mon Oct 20 14:15:36 2025 +0200
Commit: Lynne <[email protected]>
CommitDate: Wed Nov 12 15:25:07 2025 +0000
avutil/hwcontext_vulkan: actually limit number of queues
This option is parsed after it is used.
diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index d870c38a56..a6bf9a590b 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -1772,6 +1772,11 @@ static int
vulkan_device_create_internal(AVHWDeviceContext *ctx,
dev_info.pNext = p->feats.device.pNext;
dev_info.pEnabledFeatures = &p->feats.device.features;
+ /* Limit queues to a given number if needed */
+ opt_d = av_dict_get(opts, "limit_queues", NULL, 0);
+ if (opt_d)
+ p->limit_queues = strtol(opt_d->value, NULL, 10);
+
/* Setup enabled queue families */
if ((err = setup_queue_families(ctx, &dev_info)))
goto end;
@@ -1799,11 +1804,6 @@ static int
vulkan_device_create_internal(AVHWDeviceContext *ctx,
if (opt_d)
p->use_linear_images = strtol(opt_d->value, NULL, 10);
- /* Limit queues to a given number if needed */
- opt_d = av_dict_get(opts, "limit_queues", NULL, 0);
- if (opt_d)
- p->limit_queues = strtol(opt_d->value, NULL, 10);
-
/* The disable_multiplane argument takes precedent over the option */
p->disable_multiplane = disable_multiplane;
if (!p->disable_multiplane) {
-----------------------------------------------------------------------
Summary of changes:
libavutil/hwcontext_vulkan.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
