Merge "rename vp9_dct_impl_sse2.c to vp9_dct_sse2_impl.h"

test/md5_helper.h

diff --git a/test/md5_helper.h b/test/md5_helper.h
index 95f0921..742cf0b 100644
--- a/test/md5_helper.h
+++ b/test/md5_helper.h
@@ -43,7 +43,7 @@
   }
 
   void Add(const uint8_t *data, size_t size) {
-    MD5Update(&md5_, data, size);
+    MD5Update(&md5_, data, static_cast<uint32_t>(size));
   }
 
   const char *Get(void) {

test/test_intra_pred_speed.cc

diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index c954b41..2ec693b 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -332,4 +332,4 @@
                 NULL, NULL, NULL, NULL, NULL, vp9_tm_predictor_32x32_neon)
 #endif  // HAVE_NEON
 
-#include "third_party/googletest/src/src/gtest_main.cc"
+#include "test/test_libvpx.cc"

test/test_libvpx.cc

diff --git a/test/test_libvpx.cc b/test/test_libvpx.cc
index edbeec2..9b29fed 100644
--- a/test/test_libvpx.cc
+++ b/test/test_libvpx.cc
@@ -38,21 +38,21 @@
 #if ARCH_X86 || ARCH_X86_64
   const int simd_caps = x86_simd_caps();
   if (!(simd_caps & HAS_MMX))
-    append_negative_gtest_filter(":MMX/*");
+    append_negative_gtest_filter(":MMX.*:MMX/*");
   if (!(simd_caps & HAS_SSE))
-    append_negative_gtest_filter(":SSE/*");
+    append_negative_gtest_filter(":SSE.*:SSE/*");
   if (!(simd_caps & HAS_SSE2))
-    append_negative_gtest_filter(":SSE2/*");
+    append_negative_gtest_filter(":SSE2.*:SSE2/*");
   if (!(simd_caps & HAS_SSE3))
-    append_negative_gtest_filter(":SSE3/*");
+    append_negative_gtest_filter(":SSE3.*:SSE3/*");
   if (!(simd_caps & HAS_SSSE3))
-    append_negative_gtest_filter(":SSSE3/*");
+    append_negative_gtest_filter(":SSSE3.*:SSSE3/*");
   if (!(simd_caps & HAS_SSE4_1))
-    append_negative_gtest_filter(":SSE4_1/*");
+    append_negative_gtest_filter(":SSE4_1.*:SSE4_1/*");
   if (!(simd_caps & HAS_AVX))
-    append_negative_gtest_filter(":AVX/*");
+    append_negative_gtest_filter(":AVX.*:AVX/*");
   if (!(simd_caps & HAS_AVX2))
-    append_negative_gtest_filter(":AVX2/*");
+    append_negative_gtest_filter(":AVX2.*:AVX2/*");
 #endif
 
 #if !CONFIG_SHARED

vp9/decoder/vp9_decodeframe.c

diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index 7415a1b..fcf480b 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1985,15 +1985,16 @@
       const int b_h = y1 - y0 + 1;
       const int border_offset = y_pad * 3 * b_w + x_pad * 3;
 
-      return extend_and_predict(buf_ptr1, buf_stride, x0, y0, b_w, b_h,
-                                frame_width, frame_height, border_offset,
-                                dst, dst_buf->stride,
-                                subpel_x, subpel_y,
-                                kernel, sf,
+      extend_and_predict(buf_ptr1, buf_stride, x0, y0, b_w, b_h,
+                         frame_width, frame_height, border_offset,
+                         dst, dst_buf->stride,
+                         subpel_x, subpel_y,
+                         kernel, sf,
 #if CONFIG_VP9_HIGHBITDEPTH
-                                xd,
+                         xd,
 #endif
-                                w, h, ref, xs, ys);
+                         w, h, ref, xs, ys);
+      return;
     }
   } else {
     // Wait until reference block is ready. Pad 7 more pixels as last 7