[FFmpeg-cvslog] avutil/vulkan: Avoid shadowing
Andreas Rheinhardt
git at videolan.org
Mon Mar 4 00:02:06 EET 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Mar 3 17:09:33 2024 +0100| [c0d31cec7f282a88b046672cf083ec53bce05140] | committer: Andreas Rheinhardt
avutil/vulkan: Avoid shadowing
Reviewed-by: Lynne <dev at lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0d31cec7f282a88b046672cf083ec53bce05140
---
libavutil/vulkan.c | 10 ++++++----
1 file 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) {
More information about the ffmpeg-cvslog
mailing list