commit f62cbe2b564647c7f82c2129d96cce6bf172ad0e
author Jingning Han <jingning@google.com> Wed Jan 13 09:38:52 2021 -0800
committer Jingning Han <jingning@google.com> Wed Jan 13 19:32:23 2021 +0000
tree fe549078f5da4b5adbb351d66e80ccc23e6fc8a0
parent b790c9c8cf02f47cad94a33a06c8c4760174c2ef

Deprecate av1_default_scan_orders

Use av1_scan_orders to replace it for more general usage.

Change-Id: I678d0fc9a9eb86bda70bddfd0c13dc346b4658d2

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 3b42353..4d2e86d 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -864,7 +864,7 @@
   for (int r = 0; r < max_blocks_high; r += block_step) {
     for (int c = 0; c < num_4x4_w; c += block_step) {
       if (c < max_blocks_wide) {
-        const SCAN_ORDER *const scan_order = &av1_default_scan_orders[tx_size];
+        const SCAN_ORDER *const scan_order = &av1_scan_orders[tx_size][DCT_DCT];
         const int block_offset = BLOCK_OFFSET(block);
 #if CONFIG_AV1_HIGHBITDEPTH
         tran_low_t *const coeff = p->coeff + block_offset;