[FFmpeg-cvslog] [ffmpeg] branch master updated. 589b934417 compat/getopt: constify opts

[ffmpeg-git at ffmpeg.org]

The branch, master has been updated
       via  589b93441741b4ee2b65dd10405bdc44ebd0e8fd (commit)
       via  d3375101fe2a6cf11dc763899d9eca1475f4be59 (commit)
       via  218ef98ea322ee017a82ec9543ee8b88a99d46cc (commit)
       via  c5093f59c8e61c2a985177430578dfbf57356561 (commit)
      from  1ad97b82f3df0ba4822351c98385c9a2edd43502 (commit)


- Log -----------------------------------------------------------------
commit 589b93441741b4ee2b65dd10405bdc44ebd0e8fd
Author:     Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Tue Aug 12 17:40:39 2025 +0200
Commit:     Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Thu Aug 14 00:08:10 2025 +0000

    compat/getopt: constify opts
    
    Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>

diff --git a/compat/getopt.c b/compat/getopt.c
index 41a641f7c8..72110a95dd 100644
--- a/compat/getopt.c
+++ b/compat/getopt.c
@@ -38,7 +38,7 @@ static int optind = 1;
 static int optopt;
 static char *optarg;
 
-static int getopt(int argc, char *argv[], char *opts)
+static int getopt(int argc, char *argv[], const char *opts)
 {
     static int sp = 1;
     int c;

commit d3375101fe2a6cf11dc763899d9eca1475f4be59
Author:     Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Tue Aug 12 05:35:09 2025 +0200
Commit:     Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Thu Aug 14 00:08:10 2025 +0000

    avcodec/vp8: remove set, but never used variable
    
    Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 0ae50b1d7d..9010e19e6b 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -2522,7 +2522,6 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata,
     VP8ThreadData *td = &s->thread_data[threadnr];
     int mb_x, mb_y = atomic_load(&td->thread_mb_pos) >> 16, num_jobs = s->num_jobs;
     AVFrame *curframe = s->curframe->tf.f;
-    VP8Macroblock *mb;
     VP8ThreadData *prev_td, *next_td;
     uint8_t *dst[3] = {
         curframe->data[0] + 16 * mb_y * s->linesize,
@@ -2530,11 +2529,6 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata,
         curframe->data[2] +  8 * mb_y * s->uvlinesize
     };
 
-    if (s->mb_layout == 1)
-        mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1);
-    else
-        mb = s->macroblocks + (s->mb_height - mb_y - 1) * 2;
-
     if (mb_y == 0)
         prev_td = td;
     else
@@ -2544,7 +2538,7 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata,
     else
         next_td = &s->thread_data[(jobnr + 1) % num_jobs];
 
-    for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb++) {
+    for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
         const VP8FilterStrength *f = &td->filter_strength[mb_x];
         if (prev_td != td)
             check_thread_pos(td, prev_td,

commit 218ef98ea322ee017a82ec9543ee8b88a99d46cc
Author:     Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Tue Aug 12 05:34:49 2025 +0200
Commit:     Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Thu Aug 14 00:08:10 2025 +0000

    avcodec/j2kenc: remove set, but never used variable
    
    Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>

diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index 18a61eaa7d..847358dc7b 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -1268,7 +1268,7 @@ static void makelayer(Jpeg2000EncoderContext *s, int layno, double thresh, Jpeg2
 
 static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile)
 {
-    int precno, compno, reslevelno, bandno, cblkno, lev, passno, layno;
+    int precno, compno, reslevelno, bandno, cblkno, passno, layno;
     int i;
     double min = DBL_MAX;
     double max = 0;
@@ -1279,7 +1279,7 @@ static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile)
     for (compno = 0; compno < s->ncomponents; compno++){
         Jpeg2000Component *comp = tile->comp + compno;
 
-        for (reslevelno = 0, lev = codsty->nreslevels-1; reslevelno < codsty->nreslevels; reslevelno++, lev--){
+        for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++){
             Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno;
 
             for (precno = 0; precno < reslevel->num_precincts_x * reslevel->num_precincts_y; precno++){

commit c5093f59c8e61c2a985177430578dfbf57356561
Author:     Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Tue Aug 12 03:42:14 2025 +0200
Commit:     Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Thu Aug 14 00:08:10 2025 +0000

    avcodec/x86/vc1dsp: add missing header for HAVE_6REGS
    
    x86/vc1dsp_init.c already includes asm.h before, so this is mostly
    cosmetic change and only to clean checkheaders warning.
    
    Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>

diff --git a/libavcodec/x86/vc1dsp.h b/libavcodec/x86/vc1dsp.h
index 6185407b18..9c16d73fd2 100644
--- a/libavcodec/x86/vc1dsp.h
+++ b/libavcodec/x86/vc1dsp.h
@@ -21,6 +21,7 @@
 #ifndef AVCODEC_X86_VC1DSP_H
 #define AVCODEC_X86_VC1DSP_H
 
+#include "libavutil/x86/asm.h"
 #include "libavcodec/vc1dsp.h"
 
 #if HAVE_6REGS && HAVE_INLINE_ASM && HAVE_MMX_EXTERNAL

-----------------------------------------------------------------------

Summary of changes:
 compat/getopt.c         | 2 +-
 libavcodec/j2kenc.c     | 4 ++--
 libavcodec/vp8.c        | 8 +-------
 libavcodec/x86/vc1dsp.h | 1 +
 4 files changed, 5 insertions(+), 10 deletions(-)


hooks/post-receive
--