Remove adapt_scan leftovers Change-Id: Ib94b6342ac9e5f1faeb9c93458e8e85722b9f97a
diff --git a/av1/common/scan.h b/av1/common/scan.h index 588fe47..ba20989 100644 --- a/av1/common/scan.h +++ b/av1/common/scan.h
@@ -45,13 +45,6 @@ : &av1_intra_scan_orders[tx_size][tx_type]; } -static INLINE int do_adapt_scan(TX_SIZE tx_size, TX_TYPE tx_type) { - (void)tx_size; - if (tx_size_2d[tx_size] >= 1024 && tx_type != DCT_DCT) return 0; - if (tx_size > TX_32X16) return 0; - return tx_type < IDTX; -} - static INLINE const SCAN_ORDER *get_scan(const AV1_COMMON *cm, TX_SIZE tx_size, TX_TYPE tx_type, const MB_MODE_INFO *mbmi) {
diff --git a/configure b/configure index aea61db..b187f3e 100755 --- a/configure +++ b/configure
@@ -545,7 +545,6 @@ enabled loopfilter_level && enable_feature parallel_deblocking enabled loopfilter_level && enable_feature ext_delta_q enabled striped_loop_restoration && enable_feature loop_restoration - enabled adapt_scan && enable_feature lv_map enabled loopfiltering_across_tiles_ext && enable_feature loopfiltering_across_tiles soft_enable daala_tx_dst32