Merge "Bitwise to logical & in rdopt ext tx prune function" into nextgenv2

d722f71e · Sarah Parker · Gerrit Code Review · d64eaf13 · 68a26b6b · d722f71e
Commit d722f71e authored Oct 28, 2016 by Sarah Parker Committed by Gerrit Code Review Oct 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

av1/encoder/rdopt.c av1/encoder/rdopt.c +3 -3

No files found.
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -707,17 +707,17 @@ static int prune_tx_types(const AV1_COMP *cpi, BLOCK_SIZE bsize, MACROBLOCK *x,
  switch (cpi->sf.tx_type_search.prune_mode) {
    case NO_PRUNE: return 0; break;
    case PRUNE_ONE:
-      if ((tx_set >= 0) & !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D]))
+      if ((tx_set >= 0) && !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D]))
        return 0;
      return prune_one_for_sby(cpi, bsize, x, xd);
      break;
 #if CONFIG_EXT_TX
    case PRUNE_TWO:
-      if ((tx_set >= 0) & !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D])) {
+      if ((tx_set >= 0) && !(tx_set_1D[FLIPADST_1D] & tx_set_1D[ADST_1D])) {
        if (!(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D])) return 0;
        return prune_two_for_sby(cpi, bsize, x, xd, 0, 1);
      }
-      if ((tx_set >= 0) & !(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D]))
+      if ((tx_set >= 0) && !(tx_set_1D[DCT_1D] & tx_set_1D[IDTX_1D]))
        return prune_two_for_sby(cpi, bsize, x, xd, 1, 0);
      return prune_two_for_sby(cpi, bsize, x, xd, 1, 1);
      break;