PR #24092 opened by Kacper Michajłow (kasper93)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24092
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/24092.patch


From e2a22b2b94a45921fdb7f7be412e8012a01f6337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:08:08 +0200
Subject: [PATCH 01/15] checkasm/sw_ops: don't return a value from void
 functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: e65dab2b59
Signed-off-by: Kacper Michajłow <[email protected]>
---
 tests/checkasm/sw_ops.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/checkasm/sw_ops.c b/tests/checkasm/sw_ops.c
index 21b064e897..7b34af4a38 100644
--- a/tests/checkasm/sw_ops.c
+++ b/tests/checkasm/sw_ops.c
@@ -452,12 +452,12 @@ static void check_range(const char *name, const SwsUOp 
*uop,
                         const unsigned ranges[NB_PLANES])
 {
     /* Test all planes to ensure data remains untouched */
-    return check_uop(name, uop, SWS_COMP_ALL, SWS_COMP_ALL, ranges);
+    check_uop(name, uop, SWS_COMP_ALL, SWS_COMP_ALL, ranges);
 }
 
 static void check_simple(const char *name, const SwsUOp *uop)
 {
-    return check_range(name, uop, NULL);
+    check_range(name, uop, NULL);
 }
 
 static void check_scalar(const char *name, SwsUOp *uop)
@@ -471,7 +471,7 @@ static void check_vec4(const char *name, SwsUOp *uop)
     for (int i = 0; i < 4; i++)
         uop->data.vec4[i] = rndpx(uop->type);
 
-    return check_simple(name, uop);
+    check_simple(name, uop);
 }
 
 #define MK_RANGES(R) ((const unsigned[]) { R, R, R, R })
@@ -608,7 +608,7 @@ static void check_linear(const char *name, SwsUOp *uop)
         }
     }
 
-    return check_simple(name, uop);
+    check_simple(name, uop);
 }
 
 static void check_dither(const char *name, SwsUOp *uop)
-- 
2.52.0


From 59d04b738a642dde99fc6f6ea87ffac4e20f9496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:09:00 +0200
Subject: [PATCH 02/15] avutil/hwcontext_d3d12va: fix unused label warning with
 UWP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavutil/hwcontext_d3d12va.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/hwcontext_d3d12va.c b/libavutil/hwcontext_d3d12va.c
index 4f2a7393a0..f9d1721cd6 100644
--- a/libavutil/hwcontext_d3d12va.c
+++ b/libavutil/hwcontext_d3d12va.c
@@ -648,9 +648,11 @@ static int d3d12va_load_functions(AVHWDeviceContext *hwdev)
 #endif
     return 0;
 
+#if !HAVE_UWP
 fail:
     av_log(hwdev, AV_LOG_ERROR, "Failed to load D3D12 library or its 
functions\n");
     return AVERROR_UNKNOWN;
+#endif
 }
 
 static void d3d12va_device_free(AVHWDeviceContext *hwdev)
-- 
2.52.0


From 3af2756ba216a38bf99e83fd9cb977390c758dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:09:47 +0200
Subject: [PATCH 03/15] tools/ismindex: fix const qualifier discard warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 tools/ismindex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ismindex.c b/tools/ismindex.c
index b110420bf0..4fd9a781d0 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -498,7 +498,7 @@ static int handle_file(struct Tracks *tracks, const char 
*file, int split,
 {
     AVFormatContext *ctx = NULL;
     int err = 0, i, orig_tracks = tracks->nb_tracks;
-    char *ptr;
+    const char *ptr;
     struct Track *track;
 
     err = avformat_open_input(&ctx, file, NULL, NULL);
-- 
2.52.0


From 614b9ae0243e52c7652de36046b6b6323a16abde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:13:27 +0200
Subject: [PATCH 04/15] avutil/timer: fix ignored read() result
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavutil/timer.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavutil/timer.h b/libavutil/timer.h
index 03706b0d10..d253e62ec0 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -140,7 +140,8 @@
 
 #define STOP_TIMER(id)                                                      \
     ioctl(linux_perf_fd, PERF_EVENT_IOC_DISABLE, 0);                        \
-    read(linux_perf_fd, &tperf, sizeof(tperf));                             \
+    if (read(linux_perf_fd, &tperf, sizeof(tperf)) != sizeof(tperf))        \
+        tperf = 0;                                                          \
     TIMER_REPORT(id, tperf)
 
 #elif CONFIG_MACOS_KPERF
-- 
2.52.0


From 466b7c4f52697a9090d6722fda1e4b222ae20b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:14:33 +0200
Subject: [PATCH 05/15] checkasm/sbcdsp: rename CONST macro to avoid clash with
 windows.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 tests/checkasm/sbcdsp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/checkasm/sbcdsp.c b/tests/checkasm/sbcdsp.c
index 5eb0d1b3db..0ccf9df49e 100644
--- a/tests/checkasm/sbcdsp.c
+++ b/tests/checkasm/sbcdsp.c
@@ -54,9 +54,9 @@ static void check_sbc_analyze(SBCDSPContext *sbcdsp)
             // for sbc_analyze_4 it can be 0 or 8 mod 16.
             const int16_t *const inp = i || rnd() & 1 ? in : in + 4;
             // Use the proper const tables as random ones can cause overflow
-            #define CONST(SIZE, ODDEVEN) sbcdsp_analysis_consts_fixed ## SIZE 
## _simd_ ## ODDEVEN
-            const int16_t *const consts = rnd() & 1 ? (i ? CONST(8, odd)  : 
CONST(4, odd))
-                                                    : (i ? CONST(8, even) : 
CONST(4, even));
+            #define A_CONST(SIZE, ODDEVEN) sbcdsp_analysis_consts_fixed ## 
SIZE ## _simd_ ## ODDEVEN
+            const int16_t *const consts = rnd() & 1 ? (i ? A_CONST(8, odd)  : 
A_CONST(4, odd))
+                                                    : (i ? A_CONST(8, even) : 
A_CONST(4, even));
 
             call_ref(inp, out_ref, consts);
             call_new(inp, out_new, consts);
-- 
2.52.0


From 94587daf482a7b484548c1c6581c7fa5680120ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:19:00 +0200
Subject: [PATCH 06/15] avcodec/tests/x86/dct: fix ff_prores_idct_put_10
 declaration mismatch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavcodec/tests/x86/dct.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c
index f879ab1d42..9f21a93637 100644
--- a/libavcodec/tests/x86/dct.c
+++ b/libavcodec/tests/x86/dct.c
@@ -27,8 +27,8 @@
 #include "libavcodec/x86/simple_idct.h"
 
 #if CONFIG_PRORES_DECODER && ARCH_X86_64 && HAVE_X86ASM
-void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize,
-                                int16_t *block, int16_t *qmat);
+void ff_prores_idct_put_10_sse2(uint16_t *dst, ptrdiff_t linesize,
+                                int16_t *block, const int16_t *qmat);
 
 #define PR_WRAP(INSN) \
 static void ff_prores_idct_put_10_##INSN##_wrap(int16_t *dst){ \
@@ -50,8 +50,8 @@ static void ff_prores_idct_put_10_##INSN##_wrap(int16_t 
*dst){ \
 PR_WRAP(sse2)
 
 # if HAVE_AVX_EXTERNAL
-void ff_prores_idct_put_10_avx(uint16_t *dst, int linesize,
-                               int16_t *block, int16_t *qmat);
+void ff_prores_idct_put_10_avx(uint16_t *dst, ptrdiff_t linesize,
+                               int16_t *block, const int16_t *qmat);
 PR_WRAP(avx)
 # endif
 
-- 
2.52.0


From 229d478df68f210256c59370ee0af80e38eff14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:21:21 +0200
Subject: [PATCH 07/15] avutil/log: use the ANSI color table in ansi_fputs() on
 Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ansi_fputs() is reachable on Windows when stderr is not a console
or with forced color. Use real ANSI color table in this cases, otherwise
wrong values are used from Windows codes.

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavutil/log.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavutil/log.c b/libavutil/log.c
index b5d3e46d6c..11193eb238 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -62,7 +62,7 @@ static atomic_int av_log_flags = 0;
 #define NB_LEVELS 8
 #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE
 #include <windows.h>
-static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
+static const uint8_t win_color[16 + AV_CLASS_CATEGORY_NB] = {
     [AV_LOG_PANIC  /8] = 12,
     [AV_LOG_FATAL  /8] = 12,
     [AV_LOG_ERROR  /8] = 12,
@@ -93,7 +93,7 @@ static const uint8_t color[16 + AV_CLASS_CATEGORY_NB] = {
 
 static int16_t background, attr_orig;
 static HANDLE con;
-#else
+#endif
 
 static const uint32_t color[16 + AV_CLASS_CATEGORY_NB] = {
     [AV_LOG_PANIC  /8] =  52 << 16 | 196 << 8 | 0x41,
@@ -124,7 +124,6 @@ static const uint32_t color[16 + AV_CLASS_CATEGORY_NB] = {
     [16+AV_CLASS_CATEGORY_DEVICE_INPUT        ] = 207 << 8 | 0x05,
 };
 
-#endif
 static int use_color = -1;
 
 #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE
@@ -226,7 +225,7 @@ static void colored_fputs(int level, int tint, const char 
*str)
 #if defined(_WIN32) && HAVE_SETCONSOLETEXTATTRIBUTE && HAVE_GETSTDHANDLE
     if (con != INVALID_HANDLE_VALUE) {
         if (local_use_color)
-            SetConsoleTextAttribute(con, background | color[level]);
+            SetConsoleTextAttribute(con, background | win_color[level]);
         win_console_puts(str);
         if (local_use_color)
             SetConsoleTextAttribute(con, attr_orig);
-- 
2.52.0


From a6cf7b011656d1dd3ff24a82b74fd457f6bbe0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:25:11 +0200
Subject: [PATCH 08/15] avformat/rtmppkt: add fall-through annotations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavformat/rtmppkt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 4977935210..e52307c5d6 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -640,8 +640,10 @@ static void amf_tag_contents(void *ctx, const uint8_t 
*data,
         return;
     case AMF_DATA_TYPE_ARRAY:
         parse_key = 0;
+        av_fallthrough;
     case AMF_DATA_TYPE_MIXEDARRAY:
         nb = bytestream_get_be32(&data);
+        av_fallthrough;
     case AMF_DATA_TYPE_OBJECT:
         av_log(ctx, AV_LOG_DEBUG, " {\n");
         while (nb-- > 0 || type != AMF_DATA_TYPE_ARRAY) {
-- 
2.52.0


From 13f03fa65baf15d5c17dd3b98339e4276181ccd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:25:43 +0200
Subject: [PATCH 09/15] avformat/tls_securetransport: add fall-through
 annotation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavformat/tls_securetransport.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/tls_securetransport.c 
b/libavformat/tls_securetransport.c
index f52fc97db2..01965439e9 100644
--- a/libavformat/tls_securetransport.c
+++ b/libavformat/tls_securetransport.c
@@ -29,6 +29,7 @@
 #include "url.h"
 #include "tls.h"
 #include "libavcodec/internal.h"
+#include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
@@ -355,6 +356,7 @@ static int map_ssl_error(OSStatus status, size_t processed)
     case errSSLWouldBlock:
         if (processed > 0)
             return processed;
+        av_fallthrough;
     default:
         return (int)status;
     }
-- 
2.52.0


From 24adc3169edb1d15c54330ea258e97a5dcfe2a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 16:37:42 +0200
Subject: [PATCH 10/15] avutil/hwcontext_vulkan: return correctly sized array
 of instance exts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavutil/hwcontext_vulkan.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 046f2f62ad..f32e40334c 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -777,15 +777,17 @@ static const VulkanOptExtension optional_device_exts[] = {
 
 const char **av_vk_get_optional_instance_extensions(int *count)
 {
-    const char **exts = av_malloc_array(sizeof(*exts),
-                                        FF_ARRAY_ELEMS(optional_instance_exts) 
- 1);
+    /* Skip the { 0 } sentinel, which only exists to keep the
+     * initializer list valid when there are no entries */
+    const int nb_exts = FF_ARRAY_ELEMS(optional_instance_exts) - 1;
+    const char **exts = av_malloc_array(sizeof(*exts), nb_exts);
     if (!exts)
         return NULL;
 
-    for (int i = 0; i < FF_ARRAY_ELEMS(optional_instance_exts) - 1; i++)
+    for (int i = 0; i < nb_exts; i++)
         exts[i] = optional_instance_exts[i].name;
 
-    *count = FF_ARRAY_ELEMS(optional_instance_exts) - 1;
+    *count = nb_exts;
     return exts;
 }
 
-- 
2.52.0


From c5d80929a6d263222e21b66284b2f2edb5580486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 17:35:31 +0200
Subject: [PATCH 11/15] avcodec/riscv/vvc: fix implicit fall-through into no-op
 default cases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavcodec/riscv/vvc/dsp_init.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/riscv/vvc/dsp_init.c b/libavcodec/riscv/vvc/dsp_init.c
index f8fde41529..910d43a9bc 100644
--- a/libavcodec/riscv/vvc/dsp_init.c
+++ b/libavcodec/riscv/vvc/dsp_init.c
@@ -102,7 +102,6 @@ void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const 
int bd)
                 break;
             case 10:
                 c->inter.sad      = ff_vvc_sad_rvv_256;
-            default:
                 break;
         }
     } else if (vlenb >= 16) {
@@ -118,7 +117,6 @@ void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const 
int bd)
                 break;
             case 10:
                 c->inter.sad      = ff_vvc_sad_rvv_128;
-            default:
                 break;
         }
     }
-- 
2.52.0


From a7ccc72694e1b1eb5147da7c3fcf69a888e3d671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 21:19:23 +0200
Subject: [PATCH 12/15] swscale/cms: remove no-op const from return type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libswscale/cms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/cms.c b/libswscale/cms.c
index 73448ecebc..c7b196616e 100644
--- a/libswscale/cms.c
+++ b/libswscale/cms.c
@@ -57,7 +57,7 @@ bool ff_sws_color_map_noop(const SwsColorMap *map)
 }
 
 /* Approximation of gamut hull at a given intensity level */
-static const float hull(float I)
+static float hull(float I)
 {
     return ((I - 6.0f) * I + 9.0f) * I;
 }
-- 
2.52.0


From 20e855381ca389ecfa22008ad61bee0de687e6da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 21:20:12 +0200
Subject: [PATCH 13/15] fftools,tools: drop stray semicolons after
 macro-defined functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Kacper Michajłow <[email protected]>
---
 fftools/ffmpeg_filter.c |  6 +++---
 fftools/ffmpeg_opt.c    | 16 ++++++++--------
 tools/crypto_bench.c    | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index dc2069360f..9f4cf92229 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -415,13 +415,13 @@ DEF_CHOOSE_FORMAT(sample_rates, int, sample_rate, 
sample_rates, 0,
                   "%d", )
 
 DEF_CHOOSE_FORMAT(color_spaces, enum AVColorSpace, color_space, color_spaces,
-                  AVCOL_SPC_UNSPECIFIED, "%s", av_color_space_name);
+                  AVCOL_SPC_UNSPECIFIED, "%s", av_color_space_name)
 
 DEF_CHOOSE_FORMAT(color_ranges, enum AVColorRange, color_range, color_ranges,
-                  AVCOL_RANGE_UNSPECIFIED, "%s", av_color_range_name);
+                  AVCOL_RANGE_UNSPECIFIED, "%s", av_color_range_name)
 
 DEF_CHOOSE_FORMAT(alpha_modes, enum AVAlphaMode, alpha_mode, alpha_modes,
-                  AVALPHA_MODE_UNSPECIFIED, "%s", av_alpha_mode_name);
+                  AVALPHA_MODE_UNSPECIFIED, "%s", av_alpha_mode_name)
 
 static void choose_channel_layouts(OutputFilterPriv *ofp, AVBPrint *bprint)
 {
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index 9a6b97eb25..12fbd3bda8 100644
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -234,10 +234,10 @@ void opt_match_per_stream_ ## name(void *logctx, const 
SpecifierOptList *sol,
         *out = sol->opt[ret - 1].u.m;                                          
         \
 }
 
-OPT_MATCH_PER_STREAM(str,   const char *, OPT_TYPE_STRING, str);
-OPT_MATCH_PER_STREAM(int,   int,          OPT_TYPE_INT,    i);
-OPT_MATCH_PER_STREAM(int64, int64_t,      OPT_TYPE_INT64,  i64);
-OPT_MATCH_PER_STREAM(dbl,   double,       OPT_TYPE_DOUBLE, dbl);
+OPT_MATCH_PER_STREAM(str,   const char *, OPT_TYPE_STRING, str)
+OPT_MATCH_PER_STREAM(int,   int,          OPT_TYPE_INT,    i)
+OPT_MATCH_PER_STREAM(int64, int64_t,      OPT_TYPE_INT64,  i64)
+OPT_MATCH_PER_STREAM(dbl,   double,       OPT_TYPE_DOUBLE, dbl)
 
 static unsigned opt_match_per_stream_group(void *logctx, enum OptionType type,
                                            const SpecifierOptList *sol,
@@ -298,10 +298,10 @@ void opt_match_per_stream_group_ ## name(void *logctx, 
const SpecifierOptList *s
         *out = sol->opt[ret - 1].u.m;                                          
              \
 }
 
-OPT_MATCH_PER_STREAM_GROUP(str,   const char *, OPT_TYPE_STRING, str);
-OPT_MATCH_PER_STREAM_GROUP(int,   int,          OPT_TYPE_INT,    i);
-OPT_MATCH_PER_STREAM_GROUP(int64, int64_t,      OPT_TYPE_INT64,  i64);
-OPT_MATCH_PER_STREAM_GROUP(dbl,   double,       OPT_TYPE_DOUBLE, dbl);
+OPT_MATCH_PER_STREAM_GROUP(str,   const char *, OPT_TYPE_STRING, str)
+OPT_MATCH_PER_STREAM_GROUP(int,   int,          OPT_TYPE_INT,    i)
+OPT_MATCH_PER_STREAM_GROUP(int64, int64_t,      OPT_TYPE_INT64,  i64)
+OPT_MATCH_PER_STREAM_GROUP(dbl,   double,       OPT_TYPE_DOUBLE, dbl)
 
 int view_specifier_parse(const char **pspec, ViewSpecifier *vs)
 {
diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c
index 45046a0a90..f8cad2e08c 100644
--- a/tools/crypto_bench.c
+++ b/tools/crypto_bench.c
@@ -105,11 +105,11 @@ static void run_lavu_ ## suffix(uint8_t *output,          
                   \
     av_ ## namespace ## _final(h, output);                                   \
 }
 
-DEFINE_LAVU_MD(sha1,      AVSHA,    sha, 160);
-DEFINE_LAVU_MD(sha256,    AVSHA,    sha, 256);
-DEFINE_LAVU_MD(sha512,    AVSHA512, sha512, 512);
-DEFINE_LAVU_MD(ripemd128, AVRIPEMD, ripemd, 128);
-DEFINE_LAVU_MD(ripemd160, AVRIPEMD, ripemd, 160);
+DEFINE_LAVU_MD(sha1,      AVSHA,    sha, 160)
+DEFINE_LAVU_MD(sha256,    AVSHA,    sha, 256)
+DEFINE_LAVU_MD(sha512,    AVSHA512, sha512, 512)
+DEFINE_LAVU_MD(ripemd128, AVRIPEMD, ripemd, 128)
+DEFINE_LAVU_MD(ripemd160, AVRIPEMD, ripemd, 160)
 
 static void run_lavu_aes128(uint8_t *output,
                             const uint8_t *input, unsigned size)
-- 
2.52.0


From b63d1107ddb16bc898a878b66d5830dc37a29c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 21:24:32 +0200
Subject: [PATCH 14/15] avformat/wvdec: convert flags to defines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Don't use values that would extend emum data size.

Fixes: warning: enumerator value which exceeds the range of 'int' is a
       C23 extension (2147483648 is too large)

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavformat/wvdec.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c
index e69f42baf5..8abba2ccf2 100644
--- a/libavformat/wvdec.c
+++ b/libavformat/wvdec.c
@@ -30,20 +30,18 @@
 #include "id3v1.h"
 #include "wv.h"
 
-enum WV_FLAGS {
-    WV_MONO   = 0x0004,
-    WV_HYBRID = 0x0008,
-    WV_JOINT  = 0x0010,
-    WV_CROSSD = 0x0020,
-    WV_HSHAPE = 0x0040,
-    WV_FLOAT  = 0x0080,
-    WV_INT32  = 0x0100,
-    WV_HBR    = 0x0200,
-    WV_HBAL   = 0x0400,
-    WV_MCINIT = 0x0800,
-    WV_MCEND  = 0x1000,
-    WV_DSD    = 0x80000000,
-};
+#define WV_MONO   0x00000004U
+#define WV_HYBRID 0x00000008U
+#define WV_JOINT  0x00000010U
+#define WV_CROSSD 0x00000020U
+#define WV_HSHAPE 0x00000040U
+#define WV_FLOAT  0x00000080U
+#define WV_INT32  0x00000100U
+#define WV_HBR    0x00000200U
+#define WV_HBAL   0x00000400U
+#define WV_MCINIT 0x00000800U
+#define WV_MCEND  0x00001000U
+#define WV_DSD    0x80000000U
 
 static const int wv_rates[16] = {
      6000,  8000,  9600, 11025, 12000, 16000,  22050, 24000,
-- 
2.52.0


From 2eb66f3c042b9ad56a5f0b073cf28500656bd5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <[email protected]>
Date: Tue, 11 Aug 2026 21:34:36 +0200
Subject: [PATCH 15/15] avcodec/wavpack: keep flags as unsigned value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is bitfield with flags, keep it as unsigned.

Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavcodec/wavpack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 341315373f..87c2ded5e4 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -67,7 +67,7 @@ typedef enum {
 
 typedef struct WavpackFrameContext {
     AVCodecContext *avctx;
-    int frame_flags;
+    uint32_t frame_flags;
     int stereo, stereo_in;
     int joint;
     uint32_t CRC;
-- 
2.52.0

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

Reply via email to