libvpx: Pull from upstream

source/libvpx/test/subtract_test.cc

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 64 matching lines @@
 
     // set predictor
     uint8_t *predictor = bd.predictor;
     for (int r = 0; r < kBlockHeight; ++r) {
       for (int c = 0; c < kBlockWidth; ++c) {
         predictor[c] = rnd.Rand8();
       }
       predictor += kDiffPredStride;
     }
 
-    REGISTER_STATE_CHECK(GetParam()(&be, &bd, kDiffPredStride));
+    ASM_REGISTER_STATE_CHECK(GetParam()(&be, &bd, kDiffPredStride));
 
     base_src = *be.base_src;
     src_diff = be.src_diff;
     predictor = bd.predictor;
     for (int r = 0; r < kBlockHeight; ++r) {
       for (int c = 0; c < kBlockWidth; ++c) {
         EXPECT_EQ(base_src[c], (src_diff[c] + predictor[c])) << "r = " << r
                                                              << ", c = " << c;
       }
       src_diff += kDiffPredStride;
@@ skipping 18 matching lines @@
 INSTANTIATE_TEST_CASE_P(MMX, SubtractBlockTest,
                         ::testing::Values(vp8_subtract_b_mmx));
 #endif
 
 #if HAVE_SSE2
 INSTANTIATE_TEST_CASE_P(SSE2, SubtractBlockTest,
                         ::testing::Values(vp8_subtract_b_sse2));
 #endif
 
 }  // namespace