Commit dc2644ef7e for aom

commit dc2644ef7e1755f9e457828afeac9e63785ef421
Author: James Zern <jzern@google.com>
Date:   Tue Apr 14 10:39:22 2026 -0700

    clear some -Wunused-but-set-variable warnings

    Bug: 498987224
    Change-Id: I779f7a74b20957f36a8c1433a9d9a1e92cbdc22d

diff --git a/av1/encoder/nonrd_opt.c b/av1/encoder/nonrd_opt.c
index a196e0ca61..e6d0d94a6d 100644
--- a/av1/encoder/nonrd_opt.c
+++ b/av1/encoder/nonrd_opt.c
@@ -433,7 +433,7 @@ void av1_block_yrd_idtx(MACROBLOCK *x, const uint8_t *const pred_buf,
   DECLARE_BLOCK_YRD_BUFFERS()
   DECLARE_BLOCK_YRD_VARS()
   for (int r = 0; r < max_blocks_high; r += block_step) {
-    for (int c = 0, s = 0; c < max_blocks_wide; c += block_step, s += step) {
+    for (int c = 0; c < max_blocks_wide; c += block_step) {
       DECLARE_LOOP_VARS_BLOCK_YRD()
       scale_square_buf_vals(low_coeff, tx_wd, src_diff, diff_stride);
       av1_quantize_lp(low_coeff, tx_wd * tx_wd, p->round_fp_QTX,
diff --git a/av1/encoder/tx_search.c b/av1/encoder/tx_search.c
index 72ac4401a9..b23ed42073 100644
--- a/av1/encoder/tx_search.c
+++ b/av1/encoder/tx_search.c
@@ -2479,6 +2479,7 @@ static inline void try_tx_block_split(
     if (offsetr >= max_blocks_high) break;
     for (int c = 0; c < txb_width; c += sub_txb_width, ++blk_idx) {
       assert(blk_idx < 4);
+      (void)blk_idx;
       const int offsetc = blk_col + c;
       if (offsetc >= max_blocks_wide) continue;

diff --git a/av1/encoder/x86/highbd_temporal_filter_avx2.c b/av1/encoder/x86/highbd_temporal_filter_avx2.c
index acaf7678d9..0e498d67af 100644
--- a/av1/encoder/x86/highbd_temporal_filter_avx2.c
+++ b/av1/encoder/x86/highbd_temporal_filter_avx2.c
@@ -449,8 +449,8 @@ void av1_highbd_apply_temporal_filter_avx2(
           }
         }
       } else {
-        for (unsigned int i = 0, k = 0; i < plane_h; i++) {
-          for (unsigned int j = 0; j < plane_w; j++, k++) {
+        for (unsigned int i = 0; i < plane_h; i++) {
+          for (unsigned int j = 0; j < plane_w; j++) {
             for (int ii = 0; ii < (1 << ss_y_shift); ++ii) {
               for (int jj = 0; jj < (1 << ss_x_shift); ++jj) {
                 const int yy = (i << ss_y_shift) + ii;  // Y-coord on Y-plane.
diff --git a/av1/encoder/x86/highbd_temporal_filter_sse2.c b/av1/encoder/x86/highbd_temporal_filter_sse2.c
index 5cf18ab36a..b6be2d2393 100644
--- a/av1/encoder/x86/highbd_temporal_filter_sse2.c
+++ b/av1/encoder/x86/highbd_temporal_filter_sse2.c
@@ -337,8 +337,8 @@ void av1_highbd_apply_temporal_filter_sse2(
     // will be more accurate. The luma sse sum is reused in both chroma
     // planes.
     if (plane == AOM_PLANE_U) {
-      for (unsigned int i = 0, k = 0; i < plane_h; i++) {
-        for (unsigned int j = 0; j < plane_w; j++, k++) {
+      for (unsigned int i = 0; i < plane_h; i++) {
+        for (unsigned int j = 0; j < plane_w; j++) {
           for (int ii = 0; ii < (1 << ss_y_shift); ++ii) {
             for (int jj = 0; jj < (1 << ss_x_shift); ++jj) {
               const int yy = (i << ss_y_shift) + ii;  // Y-coord on Y-plane.
diff --git a/av1/encoder/x86/temporal_filter_avx2.c b/av1/encoder/x86/temporal_filter_avx2.c
index 45d563be18..3d1c9fea9f 100644
--- a/av1/encoder/x86/temporal_filter_avx2.c
+++ b/av1/encoder/x86/temporal_filter_avx2.c
@@ -626,8 +626,8 @@ void av1_apply_temporal_filter_avx2(
           }
         }
       } else {
-        for (unsigned int i = 0, k = 0; i < plane_h; i++) {
-          for (unsigned int j = 0; j < plane_w; j++, k++) {
+        for (unsigned int i = 0; i < plane_h; i++) {
+          for (unsigned int j = 0; j < plane_w; j++) {
             for (int ii = 0; ii < (1 << ss_y_shift); ++ii) {
               for (int jj = 0; jj < (1 << ss_x_shift); ++jj) {
                 const int yy = (i << ss_y_shift) + ii;  // Y-coord on Y-plane.
diff --git a/av1/encoder/x86/temporal_filter_sse2.c b/av1/encoder/x86/temporal_filter_sse2.c
index 7fcea7e450..c8baf952b1 100644
--- a/av1/encoder/x86/temporal_filter_sse2.c
+++ b/av1/encoder/x86/temporal_filter_sse2.c
@@ -315,8 +315,8 @@ void av1_apply_temporal_filter_sse2(
     // will be more accurate. The luma sse sum is reused in both chroma
     // planes.
     if (plane == AOM_PLANE_U) {
-      for (unsigned int i = 0, k = 0; i < plane_h; i++) {
-        for (unsigned int j = 0; j < plane_w; j++, k++) {
+      for (unsigned int i = 0; i < plane_h; i++) {
+        for (unsigned int j = 0; j < plane_w; j++) {
           for (int ii = 0; ii < (1 << ss_y_shift); ++ii) {
             for (int jj = 0; jj < (1 << ss_x_shift); ++jj) {
               const int yy = (i << ss_y_shift) + ii;  // Y-coord on Y-plane.