aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-16 02:06:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-16 02:51:41 +0200
commitb8598f6ce61ccda3f2ff0c730b009fb650e42986 (patch)
treeec2d7dc8cf3226d8d04cfb84878590181ef732a0
parentff6fa0b4b980fc5b9f7653d7b159ae02c3d95210 (diff)
downloadffmpeg-b8598f6ce61ccda3f2ff0c730b009fb650e42986.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>
-rw-r--r--libavcodec/diracdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index c72610a7cf..1be4115c59 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1355,8 +1355,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 */