diff options
| author | James Zern <jzern@google.com> | 2022-07-11 20:23:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-07-11 20:23:28 +0000 |
| commit | fefc38a0a5949c9dfa0eff0c0922855062bc33ff (patch) | |
| tree | 42a5849fdbaa76c35d5b52e571c4b2e495673f05 /vp8/common | |
| parent | 5b3cdae38cf210383d010fbdf893facf22871e80 (diff) | |
| parent | 873aab02adb54370c062726de056ea4f1888cb0e (diff) | |
| download | libvpx-fefc38a0a5949c9dfa0eff0c0922855062bc33ff.tar libvpx-fefc38a0a5949c9dfa0eff0c0922855062bc33ff.tar.gz libvpx-fefc38a0a5949c9dfa0eff0c0922855062bc33ff.tar.bz2 libvpx-fefc38a0a5949c9dfa0eff0c0922855062bc33ff.zip | |
Merge "vp8_macros_msa.h: avoid shadowing variables in defines" into main
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/mips/msa/vp8_macros_msa.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/common/mips/msa/vp8_macros_msa.h b/vp8/common/mips/msa/vp8_macros_msa.h index ddc881a7f..fde22f537 100644 --- a/vp8/common/mips/msa/vp8_macros_msa.h +++ b/vp8/common/mips/msa/vp8_macros_msa.h @@ -69,12 +69,12 @@ #else // !(__mips == 64) #define LD(psrc) \ ({ \ - const uint8_t *psrc_m = (const uint8_t *)(psrc); \ + const uint8_t *psrc_ld = (const uint8_t *)(psrc); \ uint32_t val0_m, val1_m; \ uint64_t val_m = 0; \ \ - val0_m = LW(psrc_m); \ - val1_m = LW(psrc_m + 4); \ + val0_m = LW(psrc_ld); \ + val1_m = LW(psrc_ld + 4); \ \ val_m = (uint64_t)(val1_m); \ val_m = (uint64_t)((val_m << 32) & 0xFFFFFFFF00000000); \ |