diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2013-05-21 10:45:53 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-21 10:45:53 -0700 |
| commit | 1db6373267b184467040ed7fa0000c0b0465b0fa (patch) | |
| tree | 4967f03c9c56c63221ddde033eb1a2920160235d /vp9/decoder/vp9_decodframe.c | |
| parent | a2b9b7448d3822f3c8de1e0ea277dc2796ebee86 (diff) | |
| parent | ba48a11130aa88cf20c2c54e43585968ce49e964 (diff) | |
| download | libvpx-1db6373267b184467040ed7fa0000c0b0465b0fa.tar libvpx-1db6373267b184467040ed7fa0000c0b0465b0fa.tar.gz libvpx-1db6373267b184467040ed7fa0000c0b0465b0fa.tar.bz2 libvpx-1db6373267b184467040ed7fa0000c0b0465b0fa.zip | |
Merge "WIP: 4x4 idct/recon merge" into experimental
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 2fc6bd930..83fb8f9d9 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -1006,14 +1006,10 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { pc->uv_dc_delta_q == 0 && pc->uv_ac_delta_q == 0; if (xd->lossless) { - xd->inv_txm4x4_1 = vp9_short_iwalsh4x4_1; - xd->inv_txm4x4 = vp9_short_iwalsh4x4; xd->itxm_add = vp9_idct_add_lossless_c; xd->itxm_add_y_block = vp9_idct_add_y_block_lossless_c; xd->itxm_add_uv_block = vp9_idct_add_uv_block_lossless_c; } else { - xd->inv_txm4x4_1 = vp9_short_idct4x4_1; - xd->inv_txm4x4 = vp9_short_idct4x4; xd->itxm_add = vp9_idct_add; xd->itxm_add_y_block = vp9_idct_add_y_block; xd->itxm_add_uv_block = vp9_idct_add_uv_block; |