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 15:14:40 +0200
commit00476d924902e3d863bab57e43f4ec0e77a30675 (patch)
tree653ad4b108d34f17586adf46df7cf06b912020d4
parentf3230ba067af1ce564661616be98110e0ff9f4c5 (diff)
downloadffmpeg-00476d924902e3d863bab57e43f4ec0e77a30675.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 13d9e478b5..48a609b1bb 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -1337,8 +1337,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 */