diff options
| author | Peter de Rivaz <peter.derivaz@gmail.com> | 2014-10-24 08:48:02 +0100 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2014-12-02 11:16:24 -0800 |
| commit | 7e40a55ef974b81b2ea401702b9522c862648fe0 (patch) | |
| tree | 7dcd2aaae01718ebd16fb3160420ba125a387671 /vp9/encoder/vp9_encodeframe.c | |
| parent | 03e267155b799fe01a0069925df7ee905e2535f8 (diff) | |
| download | libvpx-7e40a55ef974b81b2ea401702b9522c862648fe0.tar libvpx-7e40a55ef974b81b2ea401702b9522c862648fe0.tar.gz libvpx-7e40a55ef974b81b2ea401702b9522c862648fe0.tar.bz2 libvpx-7e40a55ef974b81b2ea401702b9522c862648fe0.zip | |
Added high bitdepth sse2 transform functions
Also removes some spurious changes in common/vp9_blockd.h which
was introduced by a rebase issue between nextgen and master branches.
Change-Id: If359f0e9a71bca9c2ba685a87a355873536bb282
(cherry picked from commit 005d80cd05269a299cd2f7ddbc3d4d8b791aebba)
(cherry picked from commit 08d2f548007fd8d6fd41da8ef7fdb488b6485af3)
(cherry picked from commit 4230c2306c194c058f56433a5275aa02a2e71d56)
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a5adcbb7a..d5122d0bc 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3535,9 +3535,9 @@ static void encode_frame_internal(VP9_COMP *cpi) { #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) - x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4; - else x->fwd_txm4x4 = xd->lossless ? vp9_highbd_fwht4x4 : vp9_highbd_fdct4x4; + else + x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4; x->highbd_itxm_add = xd->lossless ? vp9_highbd_iwht4x4_add : vp9_highbd_idct4x4_add; #else |