Fix compiler warnigns for msvc2013

Change-Id: I1e32bf8f6872a6fb7e9cabe86483e94805e2f790

diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index d016e97425fc9c622c4b558b7d44e0c4c8ff34fa..70b804e31b119db540dbc9304cf261f77efe25a5 100644 (file)
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -93,7 +93,7 @@ typedef struct vp9_token_state {
   int           rate;
   int           error;
   int           next;
-  signed char   token;
+  int16_t       token;
   short         qc;
 } vp9_token_state;
 

diff --git a/vp9/encoder/vp9_tokenize.h b/vp9/encoder/vp9_tokenize.h
index 5154a59ea13315459438994087b2c7b50323f0d0..81cc2e13f993ab8a2fe8774c88041dbe14cb7165 100644 (file)
--- a/vp9/encoder/vp9_tokenize.h
+++ b/vp9/encoder/vp9_tokenize.h
@@ -65,7 +65,7 @@ extern const int16_t vp9_cat6_low_cost[256];
 extern const int16_t vp9_cat6_high_cost[128];
 extern const int16_t vp9_cat6_high10_high_cost[512];
 extern const int16_t vp9_cat6_high12_high_cost[2048];
-static INLINE int16_t vp9_get_cost(uint8_t token, EXTRABIT extrabits,
+static INLINE int16_t vp9_get_cost(int16_t token, EXTRABIT extrabits,
                                    const int16_t *cat6_high_table) {
   if (token != CATEGORY6_TOKEN)
     return vp9_extra_bits[token].cost[extrabits];