Merge "Add vp9_int_pro_row_neon."

diff --cc test/vp9_avg_test.cc
index 139c412,09dbaf3..856b4c1
--- 1/test/vp9_avg_test.cc
--- 2/test/vp9_avg_test.cc
+++ b/test/vp9_avg_test.cc
@@@ -286,18 -286,11 +286,23 @@@ INSTANTIATE_TEST_CASE_P
          make_tuple(16, 16, 5, 8, &vp9_avg_8x8_neon),
          make_tuple(32, 32, 15, 8, &vp9_avg_8x8_neon)));
  
+ INSTANTIATE_TEST_CASE_P(
+     NEON, IntProRowTest, ::testing::Values(
+         make_tuple(16, &vp9_int_pro_row_neon, &vp9_int_pro_row_c),
+         make_tuple(32, &vp9_int_pro_row_neon, &vp9_int_pro_row_c),
+         make_tuple(64, &vp9_int_pro_row_neon, &vp9_int_pro_row_c)));
  #endif
  
 +#if HAVE_MSA
 +INSTANTIATE_TEST_CASE_P(
 +    MSA, AverageTest,
 +    ::testing::Values(
 +        make_tuple(16, 16, 0, 8, &vp9_avg_8x8_msa),
 +        make_tuple(16, 16, 5, 8, &vp9_avg_8x8_msa),
 +        make_tuple(32, 32, 15, 8, &vp9_avg_8x8_msa),
 +        make_tuple(16, 16, 0, 4, &vp9_avg_4x4_msa),
 +        make_tuple(16, 16, 5, 4, &vp9_avg_4x4_msa),
 +        make_tuple(32, 32, 15, 4, &vp9_avg_4x4_msa)));
 +#endif
 +
  }  // namespace

diff --cc vp9/common/vp9_rtcd_defs.pl
Simple merge