commit dd3cf8323137cf79d3001d49b1e3a372a9751234
author Thomas Davies <thdavies@cisco.com> Fri Oct 20 15:49:57 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Tue Oct 24 15:47:25 2017 +0000
tree 45c2362a32f66b67a1110ca3ff52015f79507bc2
parent 63d190aea8b74039c6de5ae2d2e8c906eb9f7021

AOM_QM: remove spurious dependence on inter/intra.

Inter/intra matrices are the same. Reduce the dimensions
of the various matrices.

Change-Id: Ie5049af9195d9c48b6928143ac04ac0a5058d0d8

av1/common/blockd.h

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