diff options
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index e2d022388..e9b0f1ad0 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -243,9 +243,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, else #endif if (pbi->common.txfm_mode == ALLOW_8X8 && -#if !CONFIG_HYBRIDTRANSFORM8X8 - xd->mode_info_context->mbmi.mode != I8X8_PRED && -#endif xd->mode_info_context->mbmi.mode != B_PRED) xd->mode_info_context->mbmi.txfm_size = TX_8X8; else @@ -261,9 +258,6 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, else #endif if (pbi->common.txfm_mode == ALLOW_8X8 && -#if !CONFIG_HYBRIDTRANSFORM8X8 - xd->mode_info_context->mbmi.mode != I8X8_PRED && -#endif xd->mode_info_context->mbmi.mode != B_PRED && xd->mode_info_context->mbmi.mode != SPLITMV) xd->mode_info_context->mbmi.txfm_size = TX_8X8; @@ -622,13 +616,10 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, #if CONFIG_SUPERBLOCKS if (!xd->mode_info_context->mbmi.encoded_as_sb) { #endif - if ((tx_type == TX_8X8 -#if CONFIG_HYBRIDTRANSFORM8X8 - && xd->mode_info_context->mbmi.mode != I8X8_PRED -#endif - ) + if ((tx_type == TX_8X8 && + xd->mode_info_context->mbmi.mode != I8X8_PRED) #if CONFIG_TX16X16 || CONFIG_HYBRIDTRANSFORM16X16 - || tx_type == TX_16X16 + || tx_type == TX_16X16 #endif ) DEQUANT_INVOKE(&pbi->dequant, idct_add_uv_block_8x8) // |