diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-03-18 08:51:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-18 08:51:19 -0700 |
| commit | 12ade557190b5cc2847daeba23b80cbe5ae2e7f7 (patch) | |
| tree | c6f508b43497cb313dacfd5fb7197b660b814315 /vp9/encoder/vp9_encodeframe.c | |
| parent | 9a56ea7e46e44c8e0242991ab1141166537380a0 (diff) | |
| parent | 005552639b276709868a4a0f86f27a737c7c6917 (diff) | |
| download | libvpx-12ade557190b5cc2847daeba23b80cbe5ae2e7f7.tar libvpx-12ade557190b5cc2847daeba23b80cbe5ae2e7f7.tar.gz libvpx-12ade557190b5cc2847daeba23b80cbe5ae2e7f7.tar.bz2 libvpx-12ade557190b5cc2847daeba23b80cbe5ae2e7f7.zip | |
Merge "removed reference to "LLM" and "x8"" into experimental
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index dd2004b01..428e585e1 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1214,10 +1214,10 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { static void switch_lossless_mode(VP9_COMP *cpi, int lossless) { if (lossless) { - cpi->mb.fwd_txm8x4 = vp9_short_walsh8x4_x8; - cpi->mb.fwd_txm4x4 = vp9_short_walsh4x4_x8; - cpi->mb.e_mbd.inv_txm4x4_1 = vp9_short_inv_walsh4x4_1_x8; - cpi->mb.e_mbd.inv_txm4x4 = vp9_short_inv_walsh4x4_x8; + cpi->mb.fwd_txm8x4 = vp9_short_walsh8x4; + cpi->mb.fwd_txm4x4 = vp9_short_walsh4x4; + cpi->mb.e_mbd.inv_txm4x4_1 = vp9_short_iwalsh4x4_1; + cpi->mb.e_mbd.inv_txm4x4 = vp9_short_iwalsh4x4; cpi->mb.optimize = 0; cpi->common.filter_level = 0; cpi->zbin_mode_boost_enabled = FALSE; @@ -1225,8 +1225,8 @@ static void switch_lossless_mode(VP9_COMP *cpi, int lossless) { } else { cpi->mb.fwd_txm8x4 = vp9_short_fdct8x4; cpi->mb.fwd_txm4x4 = vp9_short_fdct4x4; - cpi->mb.e_mbd.inv_txm4x4_1 = vp9_short_idct4x4llm_1; - cpi->mb.e_mbd.inv_txm4x4 = vp9_short_idct4x4llm; + cpi->mb.e_mbd.inv_txm4x4_1 = vp9_short_idct4x4_1; + cpi->mb.e_mbd.inv_txm4x4 = vp9_short_idct4x4; } } |