commit 3f1ae4ecd22102769dc3f4d943f3a7b1d0023a04
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Fri May 12 11:20:28 2017 +0200
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Wed May 17 10:04:23 2017 +0000
tree 0cd652cfeedc009d3ef77e2b76d689e20a644234
parent f6429c92c49469e7e02805fc87b06dbec6148513

Fix HBD compilation of daala_dist

Change-Id: Ied6a0250126587d22c50d895680eafccd8396062

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index b714887..e53a135 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6545,12 +6545,12 @@
 #if CONFIG_HIGHBITDEPTH
         if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
           aom_highbd_subtract_block(
-              height, width,
+              bsh, bsw,
               av1_raster_block_offset_int16(BLOCK_8X8, i, p->src_diff), 8,
               src_sub8x8, p->src.stride, dst_sub8x8, pd->dst.stride, xd->bd);
         } else {
           aom_subtract_block(
-              height, width,
+              bsh, bsw,
               av1_raster_block_offset_int16(BLOCK_8X8, i, p->src_diff), 8,
               src_sub8x8, p->src.stride, dst_sub8x8, pd->dst.stride);
         }

configure

diff --git a/configure b/configure
index b42f4b4..459b7ba 100755
--- a/configure
+++ b/configure
@@ -505,7 +505,6 @@
     soft_enable palette_throughput
 
     # Workaround features currently incompatible with highbitdepth
-    enabled daala_dist && disable_feature highbitdepth
     enabled tx64x64 && disable_feature highbitdepth
     enabled ext_partition && disable_feature highbitdepth