[FFmpeg-devel] lavc/vc2enc_dwt: Avoid left-shifting a negative value

Submitted by Carl Eugen Hoyos on July 2, 2019, 9:40 a.m.

Details

Message ID CAB0OVGrEqSr3gfRpiYfrZW4pd_ZgJNOExq23=vEmFT14mP9h4Q@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos July 2, 2019, 9:40 a.m.
Hi!

Attached patch intends to fix ticket #7985.

Please comment, Carl Eugen

Comments

Michael Niedermayer July 3, 2019, 7:24 p.m.
On Tue, Jul 02, 2019 at 11:40:52AM +0200, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch intends to fix ticket #7985.
> 
> Please comment, Carl Eugen

>  vc2enc_dwt.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> dad3681a3b8ddce4b2a1aa81795d042b99069117  0001-lavc-vc2enc_dwt-Avoid-left-shifting-a-negative-value.patch
> From 740f1a95336b70ff3f8e6d46f0c61115890ee3e7 Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Tue, 2 Jul 2019 11:38:14 +0200
> Subject: [PATCH] lavc/vc2enc_dwt: Avoid left-shifting a negative value.
> 
> Fixes ticket #7985.
> ---
>  libavcodec/vc2enc_dwt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

LGTM but iam not the maintainer of this

thx

[...]
Carl Eugen Hoyos July 3, 2019, 7:59 p.m.
Am Mi., 3. Juli 2019 um 21:24 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> On Tue, Jul 02, 2019 at 11:40:52AM +0200, Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch intends to fix ticket #7985.
> >
> > Please comment, Carl Eugen
>
> >  vc2enc_dwt.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > dad3681a3b8ddce4b2a1aa81795d042b99069117  0001-lavc-vc2enc_dwt-Avoid-left-shifting-a-negative-value.patch
> > From 740f1a95336b70ff3f8e6d46f0c61115890ee3e7 Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Date: Tue, 2 Jul 2019 11:38:14 +0200
> > Subject: [PATCH] lavc/vc2enc_dwt: Avoid left-shifting a negative value.
> >
> > Fixes ticket #7985.
> > ---
> >  libavcodec/vc2enc_dwt.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> LGTM but iam not the maintainer of this

I'll wait for the final colour of the memcpy hut anyway;-)

Carl Eugen
Carl Eugen Hoyos Aug. 10, 2019, 10:08 p.m.
Am Mi., 3. Juli 2019 um 21:59 Uhr schrieb Carl Eugen Hoyos <ceffmpeg@gmail.com>:
>
> Am Mi., 3. Juli 2019 um 21:24 Uhr schrieb Michael Niedermayer
> <michael@niedermayer.cc>:
> >
> > On Tue, Jul 02, 2019 at 11:40:52AM +0200, Carl Eugen Hoyos wrote:
> > > Hi!
> > >
> > > Attached patch intends to fix ticket #7985.
> > >
> > > Please comment, Carl Eugen
> >
> > >  vc2enc_dwt.c |    2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > dad3681a3b8ddce4b2a1aa81795d042b99069117  0001-lavc-vc2enc_dwt-Avoid-left-shifting-a-negative-value.patch
> > > From 740f1a95336b70ff3f8e6d46f0c61115890ee3e7 Mon Sep 17 00:00:00 2001
> > > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > > Date: Tue, 2 Jul 2019 11:38:14 +0200
> > > Subject: [PATCH] lavc/vc2enc_dwt: Avoid left-shifting a negative value.
> > >
> > > Fixes ticket #7985.
> > > ---
> > >  libavcodec/vc2enc_dwt.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > LGTM but iam not the maintainer of this
>
> I'll wait for the final colour of the memcpy hut anyway;-)

Patch applied.

Thank you, Carl Eugen

Patch hide | download patch | download mbox

From 740f1a95336b70ff3f8e6d46f0c61115890ee3e7 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Tue, 2 Jul 2019 11:38:14 +0200
Subject: [PATCH] lavc/vc2enc_dwt: Avoid left-shifting a negative value.

Fixes ticket #7985.
---
 libavcodec/vc2enc_dwt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vc2enc_dwt.c b/libavcodec/vc2enc_dwt.c
index d22af8a313..a8d3f1c669 100644
--- a/libavcodec/vc2enc_dwt.c
+++ b/libavcodec/vc2enc_dwt.c
@@ -66,7 +66,7 @@  static void vc2_subband_dwt_97(VC2TransformContext *t, dwtcoef *data,
      */
     for (y = 0; y < synth_height; y++) {
         for (x = 0; x < synth_width; x++)
-            synthl[x] = datal[x] << 1;
+            synthl[x] = datal[x] * 2;
         synthl += synth_width;
         datal += stride;
     }
-- 
2.22.0