commit edd3f9c41859ca2056c2508534755497b51f0170
author Yaowu Xu <yaowu@google.com> Fri Oct 28 21:26:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 21:26:23 2016 +0000
tree 5898d57dc43537099340ebff0537ad4698c9791f
parent efd572524244c3eeade1e0b29bce895436720b76
parent be44c5f46f8eb3e026986aa8c73ff9ce85acfece

Merge "Fix update_delta_q_probs compile warning" into nextgenv2

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b58f6e2..e62910d 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -524,9 +524,14 @@
 static void update_delta_q_probs(AV1_COMMON *cm, aom_writer *w,
                                  FRAME_COUNTS *counts) {
   int k;
-
+#if CONFIG_TILE_GROUPS
+  const int probwt = cm->num_tg;
+#else
+  const int probwt = 1;
+#endif
   for (k = 0; k < DELTA_Q_CONTEXTS; ++k) {
-    av1_cond_prob_diff_update(w, &cm->fc->delta_q_prob[k], counts->delta_q[k]);
+    av1_cond_prob_diff_update(w, &cm->fc->delta_q_prob[k], counts->delta_q[k],
+                              probwt);
   }
 }
 #endif