Merge "Fix compiler warnigns for msvc2013"

This commit is contained in:
Yaowu Xu 2015-01-06 08:01:47 -08:00 committed by Gerrit Code Review
commit 0979dbb37b
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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];