PR #23007 opened by mkver
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23007
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23007.patch

Forgotten in #22952.


>From 09693f10c2ebfa951d9b92b43ea4c92ecd27cc68 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Sun, 3 May 2026 19:02:12 +0200
Subject: [PATCH 1/3] avcodec/av1dec: Avoid implicit fallthrough

Fixes a -Wimplicit-fallthrough warning from Clang;
GCC does not warn about this.

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavcodec/av1dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
index 90621caeb6..73e0fedf30 100644
--- a/libavcodec/av1dec.c
+++ b/libavcodec/av1dec.c
@@ -1461,7 +1461,7 @@ static int av1_receive_frame_internal(AVCodecContext 
*avctx, AVFrame *frame)
         case AV1_OBU_TEMPORAL_DELIMITER:
             s->raw_frame_header = NULL;
             raw_tile_group      = NULL;
-        // fall-through
+            break;
         case AV1_OBU_TILE_LIST:
         case AV1_OBU_PADDING:
             break;
-- 
2.52.0


>From f0fabdf64a03968e939cf3fbc8bc3eb9aaa98e89 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Sun, 3 May 2026 19:09:00 +0200
Subject: [PATCH 2/3] avutil/hwcontext_vulkan: Add av_fallthrough

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavutil/hwcontext_vulkan.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 291708c3b3..881a85d33a 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -4915,6 +4915,7 @@ static int vulkan_transfer_data_to(AVHWFramesContext 
*hwfc, AVFrame *dst,
 #endif
             return vulkan_transfer_data_from_cuda(hwfc, dst, src);
 #endif
+        av_fallthrough;
     default:
         if (src->hw_frames_ctx)
             return AVERROR(ENOSYS);
@@ -5035,6 +5036,7 @@ static int vulkan_transfer_data_from(AVHWFramesContext 
*hwfc, AVFrame *dst,
 #endif
             return vulkan_transfer_data_to_cuda(hwfc, dst, src);
 #endif
+        av_fallthrough;
     default:
         if (dst->hw_frames_ctx)
             return AVERROR(ENOSYS);
-- 
2.52.0


>From bad0b4471cdda0ff687efdbbebc203623c9c162d Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <[email protected]>
Date: Sun, 3 May 2026 19:09:49 +0200
Subject: [PATCH 3/3] avutil/hwcontext_vulkan: Fix shadowing

Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavutil/hwcontext_vulkan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 881a85d33a..8ef9e2800b 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -3229,8 +3229,8 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc)
             }
             vk->GetPhysicalDeviceFormatProperties2(dev_hwctx->phys_dev, 
fmt->fallback[i], &fmtp);
 
-            for (uint32_t i = 0; i < modp.drmFormatModifierCount; ++i) {
-                VkDrmFormatModifierPropertiesEXT *m = 
&modp.pDrmFormatModifierProperties[i];
+            for (uint32_t j = 0; j < modp.drmFormatModifierCount; ++j) {
+                VkDrmFormatModifierPropertiesEXT *m = 
&modp.pDrmFormatModifierProperties[j];
                 if (m->drmFormatModifier == drm_mod.drmFormatModifier) {
                     mod_props = m;
                     break;
-- 
2.52.0

_______________________________________________
ffmpeg-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to