commit 3246fc04fbdfc3ace193616e1f35755e9f58ed6c
author Yaowu Xu <yaowu@google.com> Wed Jan 20 16:13:04 2016 -0800
committer Yaowu Xu <yaowu@google.com> Wed Jan 20 16:14:22 2016 -0800
tree 04dde1f6450032f7a97a04b620a1a431f614d1e3
parent 2334f51d5f1c0bd467b887d38a5a12a6b66d0647

vp9->vpx in --enable-vp9-highbitdepth

Also changed all related macros and tests

Change-Id: I5269578c0f716fd391111a43932f856778494d29

vp10/encoder/rdopt.h

diff --git a/vp10/encoder/rdopt.h b/vp10/encoder/rdopt.h
index b1a8036..6526d2b 100644
--- a/vp10/encoder/rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -32,7 +32,7 @@
 unsigned int vp10_get_sby_perpixel_variance(VP10_COMP *cpi,
                                            const struct buf_2d *ref,
                                            BLOCK_SIZE bs);
-#if CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_VPX_HIGHBITDEPTH
 unsigned int vp10_high_get_sby_perpixel_variance(VP10_COMP *cpi,
                                                 const struct buf_2d *ref,
                                                 BLOCK_SIZE bs, int bd);