Commit 9ca907b5 authored by Frank Galligan's avatar Frank Galligan
Browse files

libvpx: Fix some warnings.

Change-Id: If8be8b9d28a29631f29c46daea8a226ab3580610
parent 23963021
...@@ -684,7 +684,7 @@ static void decode_4x4_sb(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -684,7 +684,7 @@ static void decode_4x4_sb(VP9D_COMP *pbi, MACROBLOCKD *xd,
}; };
static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd, static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd,
int mb_row, unsigned int mb_col, int mb_row, int mb_col,
BOOL_DECODER* const bc) { BOOL_DECODER* const bc) {
int i, n, eobtotal; int i, n, eobtotal;
TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;
...@@ -810,7 +810,7 @@ static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -810,7 +810,7 @@ static void decode_superblock64(VP9D_COMP *pbi, MACROBLOCKD *xd,
} }
static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd, static void decode_superblock32(VP9D_COMP *pbi, MACROBLOCKD *xd,
int mb_row, unsigned int mb_col, int mb_row, int mb_col,
BOOL_DECODER* const bc) { BOOL_DECODER* const bc) {
int i, n, eobtotal; int i, n, eobtotal;
TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size;
......
...@@ -174,7 +174,7 @@ vp9_lookahead_peek(struct lookahead_ctx *ctx, ...@@ -174,7 +174,7 @@ vp9_lookahead_peek(struct lookahead_ctx *ctx,
int index) { int index) {
struct lookahead_entry *buf = NULL; struct lookahead_entry *buf = NULL;
assert(index < ctx->max_sz); assert(index < (int)ctx->max_sz);
if (index < (int)ctx->sz) { if (index < (int)ctx->sz) {
index += ctx->read_idx; index += ctx->read_idx;
if (index >= (int)ctx->max_sz) if (index >= (int)ctx->max_sz)
......
...@@ -847,7 +847,7 @@ static int vp9_sb_block_error_c(int16_t *coeff, int16_t *dqcoeff, ...@@ -847,7 +847,7 @@ static int vp9_sb_block_error_c(int16_t *coeff, int16_t *dqcoeff,
error += this_diff * this_diff; error += this_diff * this_diff;
} }
return error > INT_MAX ? INT_MAX : error; return error > INT_MAX ? INT_MAX : (int)error;
} }
#define DEBUG_ERROR 0 #define DEBUG_ERROR 0
...@@ -3123,9 +3123,9 @@ static void store_coding_context(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx, ...@@ -3123,9 +3123,9 @@ static void store_coding_context(MACROBLOCK *x, PICK_MODE_CONTEXT *ctx,
ctx->best_ref_mv.as_int = ref_mv->as_int; ctx->best_ref_mv.as_int = ref_mv->as_int;
ctx->second_best_ref_mv.as_int = second_ref_mv->as_int; ctx->second_best_ref_mv.as_int = second_ref_mv->as_int;
ctx->single_pred_diff = comp_pred_diff[SINGLE_PREDICTION_ONLY]; ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_PREDICTION_ONLY];
ctx->comp_pred_diff = comp_pred_diff[COMP_PREDICTION_ONLY]; ctx->comp_pred_diff = (int)comp_pred_diff[COMP_PREDICTION_ONLY];
ctx->hybrid_pred_diff = comp_pred_diff[HYBRID_PREDICTION]; ctx->hybrid_pred_diff = (int)comp_pred_diff[HYBRID_PREDICTION];
memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff)); memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment