diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-11 15:33:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-11 15:33:00 -0700 |
| commit | 107897cf052a653f6c5ccd048a2be70d6140cc79 (patch) | |
| tree | 1877e8091a157e35e1059ef12eff5a46c707809b /vp9/encoder | |
| parent | e765aade0b1a1dcb71d14c92ee207957ca9940d9 (diff) | |
| parent | 7ef573914dc2a15e9ab6507111c386cde98fd65a (diff) | |
| download | libvpx-107897cf052a653f6c5ccd048a2be70d6140cc79.tar libvpx-107897cf052a653f6c5ccd048a2be70d6140cc79.tar.gz libvpx-107897cf052a653f6c5ccd048a2be70d6140cc79.tar.bz2 libvpx-107897cf052a653f6c5ccd048a2be70d6140cc79.zip | |
Merge "Consistent names for inverse hybrid transforms (1 of 2)."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 0fc36d98f..49bd02a94 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -623,7 +623,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, // case. xd->itxm_add(dqcoeff, dst, pd->dst.stride, *eob); else - vp9_short_iht4x4_add(dqcoeff, dst, pd->dst.stride, tx_type); + vp9_iht4x4_16_add(dqcoeff, dst, pd->dst.stride, tx_type); } break; default: diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index c85535beb..2b4663af4 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1109,7 +1109,7 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib, goto next; if (tx_type != DCT_DCT) - vp9_short_iht4x4_add(BLOCK_OFFSET(pd->dqcoeff, block), + vp9_iht4x4_16_add(BLOCK_OFFSET(pd->dqcoeff, block), dst, pd->dst.stride, tx_type); else xd->itxm_add(BLOCK_OFFSET(pd->dqcoeff, block), dst, pd->dst.stride, |