diff options
author | Jingning Han <jingning@google.com> | 2014-06-26 11:00:34 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-26 11:00:34 -0700 |
commit | e15f6bc19c3ae96d4f777c3ca986142de5355246 (patch) | |
tree | 92df17fff3f39c5517c20758305fa6cd2b14511d /vp9 | |
parent | 56afb9c41ae31c9bd60e49b909940abc4bf25d71 (diff) | |
parent | 99e25ec46960685a5aa4a78e9d422e043932554c (diff) | |
download | libvpx-e15f6bc19c3ae96d4f777c3ca986142de5355246.tar libvpx-e15f6bc19c3ae96d4f777c3ca986142de5355246.tar.gz libvpx-e15f6bc19c3ae96d4f777c3ca986142de5355246.tar.bz2 libvpx-e15f6bc19c3ae96d4f777c3ca986142de5355246.zip |
Merge "Add const mark to const values in non-RD coding mode"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index d06ac5083..4c340ea0b 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -669,14 +669,14 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (!x->skip && best_rd > inter_mode_thresh && bsize <= cpi->sf.max_intra_bsize) { int i, j; - int step = 1 << mbmi->tx_size; - int width = num_4x4_blocks_wide_lookup[bsize]; - int height = num_4x4_blocks_high_lookup[bsize]; + const int step = 1 << mbmi->tx_size; + const int width = num_4x4_blocks_wide_lookup[bsize]; + const int height = num_4x4_blocks_high_lookup[bsize]; int rate2 = 0; int64_t dist2 = 0; - int dst_stride = pd->dst.stride; - int src_stride = p->src.stride; + const int dst_stride = pd->dst.stride; + const int src_stride = p->src.stride; int block_idx = 0; for (this_mode = DC_PRED; this_mode <= DC_PRED; ++this_mode) { |