]> granicus.if.org Git - libvpx/commitdiff
vp9-rtc: Fix int conversion error in nonrd_pickmode.
authorMarco Paniconi <marpan@google.com>
Thu, 25 Apr 2019 16:01:52 +0000 (09:01 -0700)
committerMarco Paniconi <marpan@google.com>
Thu, 25 Apr 2019 16:47:23 +0000 (09:47 -0700)
Change-Id: I1be775d8c11f530ff26121f1ffaf1dae100b2510

vp9/encoder/vp9_pickmode.c

index ad1dfb897ec3c7784c637272df2b98ca3581eea9..d4ffe54baa9ac51314650fcca8c03f7cc8a2de35 100644 (file)
@@ -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))