This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit a867648555b21ea04af64e48ce506255387d0631
Author:     Andreas Rheinhardt <[email protected]>
AuthorDate: Tue Apr 28 20:21:36 2026 +0200
Commit:     Andreas Rheinhardt <[email protected]>
CommitDate: Sun May 3 18:22:03 2026 +0200

    swscale/x86/swscale: Fix shadowing
    
    Reviewed-by: Ramiro Polla <[email protected]>
    Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libswscale/x86/swscale.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index 68cf15e772..04782da81c 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -91,7 +91,6 @@ void ff_updateMMXDitherTables(SwsInternal *c, int dstY)
         const int16_t **chrUSrcPtr = (const int16_t **)(void*) chrUPlane->line 
+ firstChrSrcY - chrUPlane->sliceY;
         const int16_t **alpSrcPtr  = (CONFIG_SWSCALE_ALPHA && hasAlpha) ? 
(const int16_t **)(void*) alpPlane->line + firstLumSrcY - alpPlane->sliceY : 
NULL;
 
-        int i;
         if (firstLumSrcY < 0 || firstLumSrcY + vLumFilterSize > c->opts.src_h) 
{
             const int16_t **tmpY = (const int16_t **) lumPlane->tmp;
 
@@ -132,7 +131,7 @@ void ff_updateMMXDitherTables(SwsInternal *c, int dstY)
 
         if (flags & SWS_ACCURATE_RND) {
             int s= APCK_SIZE / 8;
-            for (i=0; i<vLumFilterSize; i+=2) {
+            for (int i = 0; i < vLumFilterSize; i += 2) {
                 *(const void**)&lumMmxFilter[s*i              ]= lumSrcPtr[i  
];
                 *(const void**)&lumMmxFilter[s*i+APCK_PTR2/4  ]= 
lumSrcPtr[i+(vLumFilterSize>1)];
                 lumMmxFilter[s*i+APCK_COEF/4  ]=
@@ -145,7 +144,7 @@ void ff_updateMMXDitherTables(SwsInternal *c, int dstY)
                     alpMmxFilter[s*i+APCK_COEF/4+1]= 
lumMmxFilter[s*i+APCK_COEF/4  ];
                 }
             }
-            for (i=0; i<vChrFilterSize; i+=2) {
+            for (int i = 0; i < vChrFilterSize; i += 2) {
                 *(const void**)&chrMmxFilter[s*i              ]= chrUSrcPtr[i  
];
                 *(const void**)&chrMmxFilter[s*i+APCK_PTR2/4  ]= 
chrUSrcPtr[i+(vChrFilterSize>1)];
                 chrMmxFilter[s*i+APCK_COEF/4  ]=
@@ -153,7 +152,7 @@ void ff_updateMMXDitherTables(SwsInternal *c, int dstY)
                     + (vChrFilterSize>1 ? vChrFilter[chrDstY*vChrFilterSize + 
i + 1] * (1 << 16) : 0);
             }
         } else {
-            for (i=0; i<vLumFilterSize; i++) {
+            for (int i = 0; i < vLumFilterSize; i++) {
                 *(const void**)&lumMmxFilter[4*i+0]= lumSrcPtr[i];
                 lumMmxFilter[4*i+2]=
                 lumMmxFilter[4*i+3]=
@@ -164,7 +163,7 @@ void ff_updateMMXDitherTables(SwsInternal *c, int dstY)
                     alpMmxFilter[4*i+3]= lumMmxFilter[4*i+2];
                 }
             }
-            for (i=0; i<vChrFilterSize; i++) {
+            for (int i = 0; i < vChrFilterSize; i++) {
                 *(const void**)&chrMmxFilter[4*i+0]= chrUSrcPtr[i];
                 chrMmxFilter[4*i+2]=
                 chrMmxFilter[4*i+3]=

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

Reply via email to