diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-05 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-05 00:05:07 -0400 |
| commit | 89bdcc211e717b8f7407dd4af225ffd945dd9fe3 (patch) | |
| tree | 4212fe21393937302ab1ab93b158a5e4146a76fe /vp8/encoder/ethreading.c | |
| parent | 50643fcfd1c82d338a75ada1b26ab3a3a22f8910 (diff) | |
| parent | 91036996ac3871dccf4c6cfe47504c7b99f8555c (diff) | |
| download | libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.tar libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.tar.gz libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.tar.bz2 libvpx-89bdcc211e717b8f7407dd4af225ffd945dd9fe3.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/ethreading.c')
| -rw-r--r-- | vp8/encoder/ethreading.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index d73542226..8aef915b8 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -319,8 +319,8 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc) vpx_memcpy(z->mvcosts, x->mvcosts, sizeof(x->mvcosts)); z->mvcost[0] = &z->mvcosts[0][mv_max+1]; z->mvcost[1] = &z->mvcosts[1][mv_max+1]; - z->mvsadcost[0] = &z->mvsadcosts[0][mv_max+1]; - z->mvsadcost[1] = &z->mvsadcosts[1][mv_max+1]; + z->mvsadcost[0] = &z->mvsadcosts[0][mvfp_max+1]; + z->mvsadcost[1] = &z->mvsadcosts[1][mvfp_max+1]; vpx_memcpy(z->token_costs, x->token_costs, sizeof(x->token_costs)); |