commit 172f3c100f6043b230d91611085efdf8ade36832
author Sarah Parker <sarahparker@google.com> Fri Sep 08 14:23:36 2017 -0700
committer Sarah Parker <sarahparker@google.com> Sat Sep 09 02:14:12 2017 +0000
tree 0d6f5aff5cac71e8666868bcf7011fe60af50964
parent af210e436bf8a6c5da9c0d54ec36f21e58b6fffe

Remove const qualifier from AOM_QM seg matrices

This was causing visual stuido warnings when attempting to write
to seg_iqmatrix and seg_qmatrix using memcpy.

Change-Id: Idf12464c8c90c83af9c2b3ea399d739f7df3b5f9

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index ebb20bb..e2fae11 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -632,8 +632,8 @@
   uint8_t width, height;
 
 #if CONFIG_AOM_QM
-  const qm_val_t *seg_iqmatrix[MAX_SEGMENTS][2][TX_SIZES_ALL];
-  const qm_val_t *seg_qmatrix[MAX_SEGMENTS][2][TX_SIZES_ALL];
+  qm_val_t *seg_iqmatrix[MAX_SEGMENTS][2][TX_SIZES_ALL];
+  qm_val_t *seg_qmatrix[MAX_SEGMENTS][2][TX_SIZES_ALL];
 #endif
   // encoder
   const int16_t *dequant;

av1/decoder/detokenize.c

diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 5404b8a..7df2219 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -106,7 +106,7 @@
                         dequant_val_type_nuq *dq_val,
 #else
 #if CONFIG_AOM_QM
-                        const qm_val_t *iqm[2][TX_SIZES_ALL],
+                        qm_val_t *iqm[2][TX_SIZES_ALL],
 #endif  // CONFIG_AOM_QM
 #endif  // CONFIG_NEW_QUANT
                         int ctx, const int16_t *scan, const int16_t *nb,