diff options
| author | James Zern <jzern@google.com> | 2014-08-16 17:05:02 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-09-05 19:22:54 -0700 |
| commit | 49bb8fbaca90182bc1908e5fcae478715a15b9ed (patch) | |
| tree | d107e80e98332b242ce2eb9ffe7841eb39f9bfcb /vp9 | |
| parent | 7fe86bba2e8200d831b2beaf8ae807b1c57405c0 (diff) | |
| download | libvpx-49bb8fbaca90182bc1908e5fcae478715a15b9ed.tar libvpx-49bb8fbaca90182bc1908e5fcae478715a15b9ed.tar.gz libvpx-49bb8fbaca90182bc1908e5fcae478715a15b9ed.tar.bz2 libvpx-49bb8fbaca90182bc1908e5fcae478715a15b9ed.zip | |
vp9_pick_inter_mode: normalize some types
Change-Id: I4c74dcab6358817f03d3bc4d526006d241f0c10e
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |