summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000dwt.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-09-28 04:26:10 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-09-28 17:24:32 +0200
commit5cf593adcd79a7c9502dc2725e1f0681ada36aef (patch)
tree9999a6288e641476b398a65ac30f4fcc91203ddd /libavcodec/jpeg2000dwt.c
parent324487b596fbcda0a5753c7bb7b2e96e9d512479 (diff)
downloadffmpeg-5cf593adcd79a7c9502dc2725e1f0681ada36aef.tar.gz
avcodec/jpeg2000dwt: Fix undefined shifts of negative numbers
Affected the vsynth*-jpeg2000 and the vsynth*-jpeg2000-97 FATE tests (where * ranges over { 1, 2, 3, _lena }) as well as ticket #7983. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/jpeg2000dwt.c')
-rw-r--r--libavcodec/jpeg2000dwt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index badf0f8cd0..f418454ee9 100644
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -255,7 +255,7 @@ static void dwt_encode97_int(DWTContext *s, int *t)
line += 5;
for (i = 0; i < w * h; i++)
- t[i] <<= I_PRESHIFT;
+ t[i] *= 1 << I_PRESHIFT;
for (lev = s->ndeclevels-1; lev >= 0; lev--){
int lh = s->linelen[lev][0],