From a7c814664e3908024c097ddfc11f67997a0558f6 Mon Sep 17 00:00:00 2001 From: Peter de Rivaz Date: Mon, 26 Sep 2016 14:20:13 +0100 Subject: [PATCH] Fix for compile error with RECT_TX without EXT_TX Change-Id: I2f4e3fc877c03a5bee7f7fd1dc50e6a693697647 --- av1/decoder/decodemv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index e166fefdc..862f94a03 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c @@ -306,14 +306,14 @@ static TX_SIZE read_tx_size_inter(AV1_COMMON *cm, MACROBLOCKD *xd, if (allow_select && tx_mode == TX_MODE_SELECT) { const TX_SIZE coded_tx_size = read_selected_tx_size(cm, xd, inter_tx_size_cat_lookup[bsize], r); -#if !CONFIG_RECT_TX - assert(coded_tx_size <= max_txsize_lookup[bsize]); -#else +#if CONFIG_EXT_TX && CONFIG_RECT_TX if (coded_tx_size > max_txsize_lookup[bsize]) { assert(coded_tx_size == max_txsize_lookup[bsize] + 1); return max_txsize_rect_lookup[bsize]; } -#endif // !CONFIG_RECT_TX +#else + assert(coded_tx_size <= max_txsize_lookup[bsize]); +#endif // CONFIG_EXT_TX && CONFIG_RECT_TX return coded_tx_size; } else { return tx_size_from_tx_mode(bsize, cm->tx_mode, 1);