ref: 5fb49e456a2d430782ca010ee37b0c02e0f29488
parent: e6657f32c56aa3e6e30a05590b4a247efd12aaef
parent: ef17fc46f3d55708157f23a0f3fdf4f4e85ab9c1
author: James Zern <[email protected]>
date: Wed Apr 13 22:35:45 EDT 2016
Merge "dct32x32_test: s/HAVE_NEON_ASM/HAVE_NEON/"
--- a/test/dct32x32_test.cc
+++ b/test/dct32x32_test.cc
@@ -402,7 +402,7 @@
VPX_BITS_8)));
#endif // CONFIG_VP9_HIGHBITDEPTH
-#if HAVE_NEON_ASM && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
+#if HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(
NEON, Trans32x32Test,
::testing::Values(
@@ -410,7 +410,7 @@
&vpx_idct32x32_1024_add_neon, 0, VPX_BITS_8),
make_tuple(&vpx_fdct32x32_rd_c,
&vpx_idct32x32_1024_add_neon, 1, VPX_BITS_8)));
-#endif // HAVE_NEON_ASM && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
+#endif // HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
#if HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(