diff mbox

[FFmpeg-devel,v2,15/15] avcodec/jpeg2000dwt: Fix undefined shifts of negative numbers

Message ID 20190928022610.5903-15-andreas.rheinhardt@gmail.com
State Accepted
Commit 5cf593adcd79a7c9502dc2725e1f0681ada36aef
Headers show

Commit Message

Andreas Rheinhardt Sept. 28, 2019, 2:26 a.m. UTC 
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>
---
 libavcodec/jpeg2000dwt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer Sept. 28, 2019, 3:32 p.m. UTC | #1 
On Sat, Sep 28, 2019 at 04:26:10AM +0200, Andreas Rheinhardt wrote:
> 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>
> ---
>  libavcodec/jpeg2000dwt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

thx

[...]
diff mbox

Patch

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],