Commit f06faea4 authored by Rupert Swarbrick's avatar Rupert Swarbrick
Browse files

Fix compiler warning in block_rd_txfm

Patch a4817a6b added the sub8x8tx_in_gte8x8blk_in_plane0 variable, but
it's read in a block that doesn't exist if DISABLE_TRELLISQ_SEARCH is
true, causing a warning in the overnight "lv-map" unit tests.

Change-Id: I916b61957ffdad1ac7be38efd4051d266d4bd61c
parent 339cf93b
...@@ -1984,7 +1984,7 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col, ...@@ -1984,7 +1984,7 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
#endif #endif
int64_t rd1, rd2, rd; int64_t rd1, rd2, rd;
RD_STATS this_rd_stats; RD_STATS this_rd_stats;
#if CONFIG_DIST_8X8 #if CONFIG_DIST_8X8 && !DISABLE_TRELLISQ_SEARCH
int sub8x8tx_in_gte8x8blk_in_plane0 = int sub8x8tx_in_gte8x8blk_in_plane0 =
plane == 0 && plane_bsize >= BLOCK_8X8 && plane == 0 && plane_bsize >= BLOCK_8X8 &&
(tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4); (tx_size == TX_4X4 || tx_size == TX_4X8 || tx_size == TX_8X4);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment