shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "libvpx: Fix some warnings."

--- a/vp9/decoder/vp9_decodframe.c

+++ b/vp9/decoder/vp9_decodframe.c

@@ -684,7 +684,7 @@

 };

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

--- a/vp9/encoder/vp9_lookahead.c

+++ b/vp9/encoder/vp9_lookahead.c

@@ -174,7 +174,7 @@

                    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)

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -847,7 +847,7 @@

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

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

 }

-- 

⑨