generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix compiler warnigns for msvc2013"

Browse Source
This commit is contained in:
Yaowu Xu
2015-01-06 08:01:47 -08:00
committed by Gerrit Code Review
parent 4e00f56cd6 364b92dc88
commit 0979dbb37b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_encodemb.c
View File

@@ -93,7 +93,7 @@ typedef struct vp9_token_state {
int rate; int rate;
int error; int error;
int next; int next;
signed char token; int16_t token;
short qc; short qc;
} vp9_token_state; } vp9_token_state;

2
vp9/encoder/vp9_tokenize.h
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_high_cost[128];
extern const int16_t vp9_cat6_high10_high_cost[512]; extern const int16_t vp9_cat6_high10_high_cost[512];
extern const int16_t vp9_cat6_high12_high_cost[2048]; 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) { const int16_t *cat6_high_table) {
if (token != CATEGORY6_TOKEN) if (token != CATEGORY6_TOKEN)
return vp9_extra_bits[token].cost[extrabits]; return vp9_extra_bits[token].cost[extrabits];