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)
commitec2993d5498d2f98238e2b718f601ef9fe0849fa
treec4f4aea046d9a1ffbb2a22439074dcb43be371d6
parent329fa7009ae71eee65039174a92a27f916a246d0
parent968960c7b346c05c4a41bffc4f48952c4ef127b8
Merge changes I571a9d64,I22db73cb into main

* changes:
  dct_test: clear -Wshadow warnings
  convolve_test: clear -Wshadow warning