Merge "Fix estimate_wedge_sign with high bit-depth." into nextgenv2

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 51ee898..b000da8 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -6578,6 +6578,13 @@
   uint32_t esq[2][4], var;
   int64_t tl, br;
 
+#if CONFIG_VP9_HIGHBITDEPTH
+  if (x->e_mbd.cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
+    pred0 = CONVERT_TO_BYTEPTR(pred0);
+    pred1 = CONVERT_TO_BYTEPTR(pred1);
+  }
+#endif  // CONFIG_VP9_HIGHBITDEPTH
+
   var = cpi->fn_ptr[f_index].vf(
       src, src_stride,
       pred0, stride0, &esq[0][0]);