aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-10-09 20:46:22 +0100
committerReinhard Tartler <siretart@tauware.de>2012-03-18 17:50:36 +0100
commit0b1ac7bf4f8d091e03736decc7f8ac0357e80e5c (patch)
tree0047923911bd504b42ebe3e9fd9caae956795310
parentaf0a56e6ef3dcc140b960808b8a419d32a229775 (diff)
downloadffmpeg-0b1ac7bf4f8d091e03736decc7f8ac0357e80e5c.tar.gz
wmavoice: fix a signed overflow
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit ba3f07d0611d9a6c10eaa90b3c058ecdffe76676) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/wmavoice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 9588ecd807..1076539019 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -1085,7 +1085,7 @@ static void aw_pulse_set2(WMAVoiceContext *s, GetBitContext *gb,
int excl_range = s->aw_pulse_range; // always 16 or 24
uint16_t *use_mask_ptr = &use_mask[idx >> 4];
int first_sh = 16 - (idx & 15);
- *use_mask_ptr++ &= 0xFFFF << first_sh;
+ *use_mask_ptr++ &= 0xFFFFu << first_sh;
excl_range -= first_sh;
if (excl_range >= 16) {
*use_mask_ptr++ = 0;