diff options
| author | James Zern <jzern@google.com> | 2015-11-25 01:48:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-25 01:48:53 +0000 |
| commit | fd51d9015958811ced99b901c436403ca77876f4 (patch) | |
| tree | 9867f8a14030355fa26b16d39fca1311d5407408 /vp9/encoder/vp9_pickmode.c | |
| parent | fbd245c598e6b89b1bfecc708805bd3d4febf24f (diff) | |
| parent | eb1d0f8d60baa7e7255fa2350cd2537457f15348 (diff) | |
| download | libvpx-fd51d9015958811ced99b901c436403ca77876f4.tar libvpx-fd51d9015958811ced99b901c436403ca77876f4.tar.gz libvpx-fd51d9015958811ced99b901c436403ca77876f4.tar.bz2 libvpx-fd51d9015958811ced99b901c436403ca77876f4.zip | |
Merge changes Iaf8cbe95,I6748183d,I2a49811d
* changes:
add vp9_satd_neon
fix vp9_satd_sse2
vp9_satd: return an int
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 8aafae1d4..938a527c5 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -673,7 +673,7 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, int64_t *dist, if (*eob == 1) *rate += (int)abs(qcoeff[0]); else if (*eob > 1) - *rate += (int)vp9_satd((const int16_t *)qcoeff, step << 4); + *rate += vp9_satd((const int16_t *)qcoeff, step << 4); *dist += vp9_block_error_fp(coeff, dqcoeff, step << 4) >> shift; } |