aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-03 17:09:33 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2024-03-03 22:56:17 +0100
commitc0d31cec7f282a88b046672cf083ec53bce05140 (patch)
tree16ee27a218c16b68bf0a417acc83fd6f644a44f8
parent0a05577d1e2f3ac2729fd1a96cbef352df20366a (diff)
downloadffmpeg-c0d31cec7f282a88b046672cf083ec53bce05140.tar.gz
avutil/vulkan: Avoid shadowing
Reviewed-by: Lynne <dev@lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavutil/vulkan.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 76b61dcaaa..4392a77d6c 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -1308,13 +1308,15 @@ void ff_vk_frame_barrier(FFVulkanContext *s, FFVkExecContext *e,
VkImageLayout new_layout,
uint32_t new_qf)
{
- int i, found;
+ int found = -1;
AVVkFrame *vkf = (AVVkFrame *)pic->data[0];
const int nb_images = ff_vk_count_images(vkf);
- for (i = 0; i < e->nb_frame_deps; i++)
- if (e->frame_deps[i]->data[0] == pic->data[0])
+ for (int i = 0; i < e->nb_frame_deps; i++)
+ if (e->frame_deps[i]->data[0] == pic->data[0]) {
+ if (e->frame_update[i])
+ found = i;
break;
- found = (i < e->nb_frame_deps) && (e->frame_update[i]) ? i : -1;
+ }
for (int i = 0; i < nb_images; i++) {
bar[*nb_bar] = (VkImageMemoryBarrier2) {