[x264-devel] Shrink two arrays

[Henrik Gramner]

x264 | branch: master | Henrik Gramner <hengar-6 at student.ltu.se> | Wed Jul 20 22:30:59 2011 +0200| [2bd11d1ac5220c21fd45994d7f3099810d5809df] | committer: Jason Garrett-Glaser

Shrink two arrays

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=2bd11d1ac5220c21fd45994d7f3099810d5809df
---

 common/dct.c  |    4 ++--
 common/dct.h  |    4 ++--
 encoder/rdo.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/dct.c b/common/dct.c
index 38d3be3..0acf685 100644
--- a/common/dct.c
+++ b/common/dct.c
@@ -35,8 +35,8 @@
 #   include "arm/dct.h"
 #endif
 
-int x264_dct4_weight2_zigzag[2][16];
-int x264_dct8_weight2_zigzag[2][64];
+uint16_t x264_dct4_weight2_zigzag[2][16];
+uint16_t x264_dct8_weight2_zigzag[2][64];
 
 static void dct4x4dc( dctcoef d[16] )
 {
diff --git a/common/dct.h b/common/dct.h
index 9303d44..a764e49 100644
--- a/common/dct.h
+++ b/common/dct.h
@@ -88,8 +88,8 @@ static const uint16_t x264_dct8_weight2_tab[64] = {
 };
 #undef W
 
-extern int x264_dct4_weight2_zigzag[2][16]; // [2] = {frame, field}
-extern int x264_dct8_weight2_zigzag[2][64];
+extern uint16_t x264_dct4_weight2_zigzag[2][16]; // [2] = {frame, field}
+extern uint16_t x264_dct8_weight2_zigzag[2][64];
 
 typedef struct
 {
diff --git a/encoder/rdo.c b/encoder/rdo.c
index 399bf37..36cb468 100644
--- a/encoder/rdo.c
+++ b/encoder/rdo.c
@@ -439,7 +439,7 @@ typedef struct
 static ALWAYS_INLINE
 int quant_trellis_cabac( x264_t *h, dctcoef *dct,
                          const udctcoef *quant_mf, const int *unquant_mf,
-                         const int *coef_weight, const uint8_t *zigzag,
+                         const uint16_t *coef_weight, const uint8_t *zigzag,
                          int ctx_block_cat, int i_lambda2, int b_ac,
                          int b_chroma, int dc, int i_coefs, int idx )
 {
@@ -685,7 +685,7 @@ int quant_trellis_cabac( x264_t *h, dctcoef *dct,
 static ALWAYS_INLINE
 int quant_trellis_cavlc( x264_t *h, dctcoef *dct,
                          const udctcoef *quant_mf, const int *unquant_mf,
-                         const int *coef_weight, const uint8_t *zigzag,
+                         const uint16_t *coef_weight, const uint8_t *zigzag,
                          int ctx_block_cat, int i_lambda2, int b_ac,
                          int b_chroma, int dc, int i_coefs, int idx, int b_8x8 )
 {