Merge "ext_tx: fix a signed overflow" into nextgenv2

438b1dcb · Alex Converse · Gerrit Code Review · 2b476289 · aa77b516 · 438b1dcb
Commit 438b1dcb authored Oct 04, 2016 by Alex Converse Committed by Gerrit Code Review Oct 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

av1/encoder/dct.c av1/encoder/dct.c +1 -1

No files found.
--- a/av1/encoder/dct.c
+++ b/av1/encoder/dct.c
@@ -1871,7 +1871,7 @@ void av1_fwd_idtx_c(const int16_t *src_diff, tran_low_t *coeff, int stride,
  const int shift = bs < 32 ? 3 : 2;
  if (tx_type == IDTX) {
    for (r = 0; r < bs; ++r) {
-      for (c = 0; c < bs; ++c) coeff[c] = src_diff[c] << shift;
+      for (c = 0; c < bs; ++c) coeff[c] = src_diff[c] * (1 << shift);
      src_diff += stride;
      coeff += bs;
    }