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-23 16:51:08 +0200
commitec2ce83913ca770f9f8dc5fb6052d36dc25011ed (patch)
tree78c49d50209ffbec59a0bd4d9c0d849ccaf43eee
parent1d912513703967023748f020dbb999ed6c3d83ea (diff)
downloadffmpeg-ec2ce83913ca770f9f8dc5fb6052d36dc25011ed.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 4990659812..dfd3734edb 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1360,8 +1360,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 */