From 9ca907b53e6653866f985831b8580925f4dd4ba4 Mon Sep 17 00:00:00 2001 From: Frank Galligan Date: Fri, 18 Jan 2013 09:44:23 -0800 Subject: [PATCH] libvpx: Fix some warnings. Change-Id: If8be8b9d28a29631f29c46daea8a226ab3580610 --- vp9/decoder/vp9_decodframe.c | 4 ++-- vp9/encoder/vp9_lookahead.c | 2 +- vp9/encoder/vp9_rdopt.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 361de33b9..c3b9637a6 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -684,7 +684,7 @@ static void decode_4x4_sb(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) { int i, n, eobtotal; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; @@ -810,7 +810,7 @@ static void decode_superblock64(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) { int i, n, eobtotal; TX_SIZE tx_size = xd->mode_info_context->mbmi.txfm_size; diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c index a51c78656..1bca9d267 100644 --- a/vp9/encoder/vp9_lookahead.c +++ b/vp9/encoder/vp9_lookahead.c @@ -174,7 +174,7 @@ vp9_lookahead_peek(struct lookahead_ctx *ctx, int index) { struct lookahead_entry *buf = NULL; - assert(index < ctx->max_sz); + assert(index < (int)ctx->max_sz); if (index < (int)ctx->sz) { index += ctx->read_idx; if (index >= (int)ctx->max_sz) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 5e76d9372..e8d0cc68e 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -847,7 +847,7 @@ static int vp9_sb_block_error_c(int16_t *coeff, int16_t *dqcoeff, error += this_diff * this_diff; } - return error > INT_MAX ? INT_MAX : error; + return error > INT_MAX ? INT_MAX : (int)error; } #define DEBUG_ERROR 0 @@ -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->second_best_ref_mv.as_int = second_ref_mv->as_int; - ctx->single_pred_diff = comp_pred_diff[SINGLE_PREDICTION_ONLY]; - ctx->comp_pred_diff = comp_pred_diff[COMP_PREDICTION_ONLY]; - ctx->hybrid_pred_diff = comp_pred_diff[HYBRID_PREDICTION]; + ctx->single_pred_diff = (int)comp_pred_diff[SINGLE_PREDICTION_ONLY]; + ctx->comp_pred_diff = (int)comp_pred_diff[COMP_PREDICTION_ONLY]; + ctx->hybrid_pred_diff = (int)comp_pred_diff[HYBRID_PREDICTION]; memcpy(ctx->txfm_rd_diff, txfm_size_diff, sizeof(ctx->txfm_rd_diff)); }