commit 76fcff7c6441b8d4539c0ea8fe6e86a7ab9025d2
author Zoe Liu <zoeliu@google.com> Mon Apr 24 17:50:53 2017 -0700
committer Zoe Liu <zoeliu@google.com> Tue Apr 25 02:33:23 2017 +0000
tree 2b75e8287e0c2e086c334bbef60d006c18c583bf
parent b926f32deb3bede53ab6ff8beb35039839050715

Clean a small portion of code for highbitdepth setup

BUG=aomedia:442

Change-Id: I63ae1f2842c503cc4807e5ee7d2c10c309c56f40

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 35aacb9..52c54d8 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5621,6 +5621,7 @@
           plane, MV_PRECISION_Q3, mi_col * MI_SIZE, mi_row * MI_SIZE, xd);
     } else {
       second_pred = (uint8_t *)second_pred_alloc_16;
+#endif  // CONFIG_HIGHBITDEPTH
       av1_build_inter_predictor(
           ref_yv12[!id].buf, ref_yv12[!id].stride, second_pred, pw,
           &frame_mv[refs[!id]].as_mv, &sf, pw, ph, &conv_params, interp_filter,
@@ -5628,15 +5629,8 @@
           &warp_types, p_col, p_row, plane, !id,
 #endif  // CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
           MV_PRECISION_Q3, mi_col * MI_SIZE, mi_row * MI_SIZE, xd);
+#if CONFIG_HIGHBITDEPTH
     }
-#else
-    av1_build_inter_predictor(
-        ref_yv12[!id].buf, ref_yv12[!id].stride, second_pred, pw,
-        &frame_mv[refs[!id]].as_mv, &sf, pw, ph, &conv_params, interp_filter,
-#if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
-        &warp_types, p_col, p_row, plane, !id,
-#endif  // CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
-        MV_PRECISION_Q3, mi_col * MI_SIZE, mi_row * MI_SIZE, xd);
 #endif  // CONFIG_HIGHBITDEPTH
 
     // Do compound motion search on the current reference frame.