commit 12ab4af3aefb320996ace24083fd26e857f4c533
author James Zern <jzern@google.com> Thu Apr 06 13:00:47 2023 -0700
committer James Zern <jzern@google.com> Thu Apr 06 15:37:40 2023 -0700
tree 487ed652a544a2462774971dece05ef9b14a9212
parent bebc860915188e2fda3983c7d8504371beb2f518

vp9_dx_iface: clear -Wshadow warnings

Bug: webm:1793
Change-Id: Ice6cd08f145e5813e24345d03e0913e5eda5289f

vp9/vp9_dx_iface.c

diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c
index bdfe217..20e71cc 100644
--- a/vp9/vp9_dx_iface.c
+++ b/vp9/vp9_dx_iface.c
@@ -348,7 +348,7 @@
 
   // Initialize the decoder on the first frame.
   if (ctx->pbi == NULL) {
-    const vpx_codec_err_t res = init_decoder(ctx);
+    res = init_decoder(ctx);
     if (res != VPX_CODEC_OK) return res;
   }
 
@@ -367,7 +367,6 @@
     for (i = 0; i < frame_count; ++i) {
       const uint8_t *data_start_copy = data_start;
       const uint32_t frame_size = frame_sizes[i];
-      vpx_codec_err_t res;
       if (data_start < data || frame_size > (uint32_t)(data_end - data_start)) {
         set_error_detail(ctx, "Invalid frame size in index");
         return VPX_CODEC_CORRUPT_FRAME;
@@ -382,8 +381,7 @@
     const uint8_t *const data_end = data + data_sz;
     while (data_start < data_end) {
       const uint32_t frame_size = (uint32_t)(data_end - data_start);
-      const vpx_codec_err_t res =
-          decode_one(ctx, &data_start, frame_size, user_priv, deadline);
+      res = decode_one(ctx, &data_start, frame_size, user_priv, deadline);
       if (res != VPX_CODEC_OK) return res;
 
       // Account for suboptimal termination by the encoder.