diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-16 02:06:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-22 00:21:28 +0200 |
commit | d51e0dd9b4d4169722092462feeb8e7c4b6bcf81 (patch) | |
tree | 66c0fd9edc7b1c56184e64c74e6cc12d64a24263 | |
parent | f30bd7c21569cffa35725cdb2a32195e43b962f0 (diff) | |
download | ffmpeg-d51e0dd9b4d4169722092462feeb8e7c4b6bcf81.tar.gz |
avcodec/diracdec: fix undefined behavior with shifts
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/diracdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index c431b97019..2f1a4a58dd 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1342,8 +1342,8 @@ static int mc_subpel(DiracContext *s, DiracBlock *block, const uint8_t *src[5], motion_y >>= s->chroma_y_shift; } - mx = motion_x & ~(-1 << s->mv_precision); - my = motion_y & ~(-1 << s->mv_precision); + mx = motion_x & ~(-1U << s->mv_precision); + my = motion_y & ~(-1U << s->mv_precision); motion_x >>= s->mv_precision; motion_y >>= s->mv_precision; /* normalize subpel coordinates to epel */ |