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/extend.c

diff --git a/vp10/encoder/extend.c b/vp10/encoder/extend.c
index 4c8ce3b..b6d32c6 100644
--- a/vp10/encoder/extend.c
+++ b/vp10/encoder/extend.c
@@ -57,7 +57,7 @@
   }
 }
 
-#if CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_VPX_HIGHBITDEPTH
 static void highbd_copy_and_extend_plane(const uint8_t *src8, int src_pitch,
                                          uint8_t *dst8, int dst_pitch,
                                          int w, int h,
@@ -101,7 +101,7 @@
     dst_ptr2 += dst_pitch;
   }
 }
-#endif  // CONFIG_VP9_HIGHBITDEPTH
+#endif  // CONFIG_VPX_HIGHBITDEPTH
 
 void vp10_copy_and_extend_frame(const YV12_BUFFER_CONFIG *src,
                                YV12_BUFFER_CONFIG *dst) {
@@ -125,7 +125,7 @@
   const int eb_uv = eb_y >> uv_height_subsampling;
   const int er_uv = er_y >> uv_width_subsampling;
 
-#if CONFIG_VP9_HIGHBITDEPTH
+#if CONFIG_VPX_HIGHBITDEPTH
   if (src->flags & YV12_FLAG_HIGHBITDEPTH) {
     highbd_copy_and_extend_plane(src->y_buffer, src->y_stride,
                                  dst->y_buffer, dst->y_stride,
@@ -143,7 +143,7 @@
                                  et_uv, el_uv, eb_uv, er_uv);
     return;
   }
-#endif  // CONFIG_VP9_HIGHBITDEPTH
+#endif  // CONFIG_VPX_HIGHBITDEPTH
 
   copy_and_extend_plane(src->y_buffer, src->y_stride,
                         dst->y_buffer, dst->y_stride,