diff options
| author | James Zern <jzern@google.com> | 2019-09-28 13:12:49 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2019-09-30 11:13:29 -0700 |
| commit | fad865c54ad99ada3e53ea4a290688f0c56aa15d (patch) | |
| tree | 2878dfe8b6fe4a65f4a1e84419fefb147ad7540a /vp8/encoder/onyx_if.c | |
| parent | 4f69df9969745c3bec295edbb5514a2cc04c7e26 (diff) | |
| download | libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.gz libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.tar.bz2 libvpx-fad865c54ad99ada3e53ea4a290688f0c56aa15d.zip | |
namespace ARCH_* defines
this prevents redefinition warnings if a toolchain sets one
BUG=b/117240165
Change-Id: Ib5d8c303cd05b4dbcc8d42c71ecfcba8f6d7b90c
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index f72303dde..8bd4f361c 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -38,7 +38,7 @@ #include "vpx_ports/system_state.h" #include "vpx_ports/vpx_timer.h" #include "vpx_util/vpx_write_yuv_frame.h" -#if ARCH_ARM +#if VPX_ARCH_ARM #include "vpx_ports/arm.h" #endif #if CONFIG_MULTI_RES_ENCODING @@ -2043,7 +2043,7 @@ struct VP8_COMP *vp8_create_compressor(VP8_CONFIG *oxcf) { cpi->fn_ptr[BLOCK_4X4].sdx8f = vpx_sad4x4x8; cpi->fn_ptr[BLOCK_4X4].sdx4df = vpx_sad4x4x4d; -#if ARCH_X86 || ARCH_X86_64 +#if VPX_ARCH_X86 || VPX_ARCH_X86_64 cpi->fn_ptr[BLOCK_16X16].copymem = vp8_copy32xn; cpi->fn_ptr[BLOCK_16X8].copymem = vp8_copy32xn; cpi->fn_ptr[BLOCK_8X16].copymem = vp8_copy32xn; |