diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-29 17:35:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-29 17:35:05 -0700 |
| commit | 17544d1478febf1b047a4d021336402b7d6762af (patch) | |
| tree | 4d0ad7b035f9a133e202467a460affc7e024b7af /vp9/encoder/vp9_rdopt.c | |
| parent | 7873de1481cc66da342625c11b39971da14cbcec (diff) | |
| parent | 4487f5a69059e44cf6400754bd2d9af42f74bb5f (diff) | |
| download | libvpx-17544d1478febf1b047a4d021336402b7d6762af.tar libvpx-17544d1478febf1b047a4d021336402b7d6762af.tar.gz libvpx-17544d1478febf1b047a4d021336402b7d6762af.tar.bz2 libvpx-17544d1478febf1b047a4d021336402b7d6762af.zip | |
Merge "Remove some unused code related to macroblock/splitmv coding." into experimental
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index dbbabdc24..1026bd67d 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -926,8 +926,8 @@ int vp9_cost_mv_ref(VP9_COMP *cpi, vp9_prob p [VP9_MVREFS - 1]; assert(NEARESTMV <= m && m <= SPLITMV); vp9_mv_ref_probs(pc, p, mode_context); - return cost_token(vp9_mv_ref_tree, p, - vp9_mv_ref_encoding_array - NEARESTMV + m); + return cost_token(vp9_sb_mv_ref_tree, p, + vp9_sb_mv_ref_encoding_array - NEARESTMV + m); } else return 0; } |