diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2015-05-12 23:33:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-12 23:33:31 +0000 |
| commit | f72af263058fcce79bd48873546912d06ba35270 (patch) | |
| tree | ddfde954fcb1dd4589b21498ca4c997ae67ee734 /vp9/encoder | |
| parent | a8015e217ef0aadbe389ef08e409605843888ed9 (diff) | |
| parent | 8ba2d2d5a0f0f1c41e8de03544cab755270db711 (diff) | |
| download | libvpx-f72af263058fcce79bd48873546912d06ba35270.tar libvpx-f72af263058fcce79bd48873546912d06ba35270.tar.gz libvpx-f72af263058fcce79bd48873546912d06ba35270.tar.bz2 libvpx-f72af263058fcce79bd48873546912d06ba35270.zip | |
Merge "Remove unneeded variable declaration"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 9fb7cfba7..94253be3f 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1594,7 +1594,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (cpi->sf.adaptive_rd_thresh) { THR_MODES best_mode_idx = mode_idx[best_ref_frame][mode_offset(mbmi->mode)]; - PREDICTION_MODE this_mode; if (best_ref_frame == INTRA_FRAME) { // Only consider the modes that are included in the intra_mode_list. @@ -1604,12 +1603,12 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, // TODO(yunqingwang): Check intra mode mask and only update freq_fact // for those valid modes. for (i = 0; i < intra_modes; i++) { - PREDICTION_MODE this_mode = intra_mode_list[i]; update_thresh_freq_fact(cpi, tile_data, bsize, INTRA_FRAME, - best_mode_idx, this_mode); + best_mode_idx, intra_mode_list[i]); } } else { for (ref_frame = LAST_FRAME; ref_frame <= GOLDEN_FRAME; ++ref_frame) { + PREDICTION_MODE this_mode; if (best_ref_frame != ref_frame) continue; for (this_mode = NEARESTMV; this_mode <= NEWMV; ++this_mode) { update_thresh_freq_fact(cpi, tile_data, bsize, ref_frame, |