diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-09 00:05:06 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-09 00:05:06 -0500 |
| commit | 96208f2e45f0fb0e9e2a0b47c9b45bd4b0247482 (patch) | |
| tree | be2c9e1d03eb309d6d7f8c3b000c8b15f1aec5bf /vp8/encoder/rdopt.c | |
| parent | b7ec812e2db3bca83d15faadd14eba444fb55f4d (diff) | |
| parent | 95adf3df77439740526b73bca7242f7096687d82 (diff) | |
| download | libvpx-96208f2e45f0fb0e9e2a0b47c9b45bd4b0247482.tar libvpx-96208f2e45f0fb0e9e2a0b47c9b45bd4b0247482.tar.gz libvpx-96208f2e45f0fb0e9e2a0b47c9b45bd4b0247482.tar.bz2 libvpx-96208f2e45f0fb0e9e2a0b47c9b45bd4b0247482.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 3db05155c..867ff6a9c 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -2033,7 +2033,7 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int else cpi->zbin_mode_boost = LF_ZEROMV_ZBIN_BOOST; } - else if (vp8_ref_frame_order[mode_index] == SPLITMV) + else if (vp8_mode_order[mode_index] == SPLITMV) cpi->zbin_mode_boost = 0; else cpi->zbin_mode_boost = MV_ZBIN_BOOST; |