fwd_txfm2d: Fix undefined left shift in SetPair Change-Id: I9eb876b67cd497ce081dcfc181cee6b4483e7154 (cherry picked from commit b7456162f471327119818a191d37260ca22153a7)
diff --git a/av1/encoder/av1_fwd_txfm2d_hwy.h b/av1/encoder/av1_fwd_txfm2d_hwy.h index 197aa28..2924773 100644 --- a/av1/encoder/av1_fwd_txfm2d_hwy.h +++ b/av1/encoder/av1_fwd_txfm2d_hwy.h
@@ -132,9 +132,11 @@ template <typename D> HWY_ATTR HWY_INLINE hn::VFromD<D> SetPair(D int_tag, int a, int b) { return hn::BitCast( - int_tag, hn::Set(hn::RepartitionToWide<D>(), - static_cast<int32_t>(static_cast<uint16_t>(a) | - (static_cast<uint32_t>(b) << 16)))); + int_tag, + hn::Set(hn::RepartitionToWide<D>(), + static_cast<int32_t>( + static_cast<uint16_t>(a) | + (static_cast<uint32_t>(static_cast<uint16_t>(b)) << 16)))); } template <size_t LaneSize>