Merge changes I571a9d64,I22db73cb into main
authorJames Zern <jzern@google.com>
Thu, 13 Apr 2023 18:35:21 +0000 (18:35 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 13 Apr 2023 18:35:21 +0000 (18:35 +0000)
* changes:
  dct_test: clear -Wshadow warnings
  convolve_test: clear -Wshadow warning


Trivial merge