From f836d8ba87dcba437228580fe65afe151ccf7659 Mon Sep 17 00:00:00 2001 From: Marco Paniconi Date: Thu, 25 Apr 2019 09:01:52 -0700 Subject: [PATCH] vp9-rtc: Fix int conversion error in nonrd_pickmode. Change-Id: I1be775d8c11f530ff26121f1ffaf1dae100b2510 --- vp9/encoder/vp9_pickmode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index ad1dfb897..d4ffe54ba 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -352,7 +352,7 @@ static TX_SIZE calculate_tx_size(VP9_COMP *const cpi, BLOCK_SIZE bsize, unsigned int source_variance, int is_intra) { // TODO(marpan): Tune selection for intra-modes, screen content, etc. TX_SIZE tx_size; - unsigned int var_thresh = (is_intra) ? ac_thr : 1; + unsigned int var_thresh = is_intra ? (unsigned int)ac_thr : 1; int limit_tx = 1; if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && (source_variance == 0 || var < var_thresh)) -- 2.40.0