commit 599395ee5c2bb517de401f565e22d342484d8818
author Thomas Davies <thdavies@cisco.com> Fri Jul 21 18:02:48 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Mon Jul 24 18:58:46 2017 +0000
tree fdfc5c0767edb1dbc26f057799955fc7180faf8a
parent 4c5df1058a0c37ffd06e02be6bfddd16b9b9cbae

NEW_MULTISYMBOL: adapt binary MV values.

Change-Id: I00f98e0e03a44aa894566b7a47bb0f32b56da766

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 856e367..b860392 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -4557,10 +4557,10 @@
   MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;
 #endif  // CONFIG_SUPERTX
   FRAME_CONTEXT *const fc = cm->fc;
-  FRAME_COUNTS *counts = cpi->td.counts;
   aom_writer *header_bc;
   int i;
 #if !CONFIG_NEW_MULTISYMBOL
+  FRAME_COUNTS *counts = cpi->td.counts;
   int j;
 #endif
 
@@ -4712,7 +4712,9 @@
                                 counts->comp_inter_mode[i], probwt);
 #endif  // CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF
 
+#if !CONFIG_NEW_MULTISYMBOL
     av1_write_nmv_probs(cm, cm->allow_high_precision_mv, header_bc, counts->mv);
+#endif
 #if CONFIG_SUPERTX
     if (!xd->lossless[0]) update_supertx_probs(cm, probwt, header_bc);
 #endif  // CONFIG_SUPERTX