aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-16 02:06:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-09 01:13:58 +0200
commit90b69d1d020bde80a2b24c4a40c17363e482fc9b (patch)
treec86873db81c45e063b7a2ec1406601c731276d56
parent71a3ad42b8c9e2bfeb5d4987d57780e0f8dc434c (diff)
downloadffmpeg-90b69d1d020bde80a2b24c4a40c17363e482fc9b.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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 7fa7137cac..50457232ab 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1332,8 +1332,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 */