From: James Zern Date: Sun, 17 Aug 2014 00:05:02 +0000 (-0700) Subject: vp9_pick_inter_mode: normalize some types X-Git-Tag: v1.4.0~823^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49bb8fbaca90182bc1908e5fcae478715a15b9ed;p=libvpx vp9_pick_inter_mode: normalize some types Change-Id: I4c74dcab6358817f03d3bc4d526006d241f0c10e --- diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index e046791ea..a97d77831 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -443,9 +443,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 20 * vp9_dc_quant(cm->base_qindex, cm->y_dc_delta_q); const int64_t inter_mode_thresh = RDCOST(x->rdmult, x->rddiv, intra_cost_penalty, 0); - const int64_t intra_mode_cost = 50; + const int intra_mode_cost = 50; - unsigned char segment_id = mbmi->segment_id; + const int8_t segment_id = mbmi->segment_id; const int *const rd_threshes = cpi->rd.threshes[segment_id][bsize]; const int *const rd_thresh_freq_fact = cpi->rd.thresh_freq_fact[bsize]; INTERP_FILTER filter_ref = cm->interp_filter;