| Message ID | 20200121221454.17655-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,1/3] swscale/input: Fix several invalid shifts related to rgb2yuv constants | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
On Tue, Jan 21, 2020 at 11:24 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: Invalid shifts > Fixes: #8166 > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libswscale/swscale.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libswscale/swscale.c b/libswscale/swscale.c > index 4ecfa88ff7..8436f056d4 100644 > --- a/libswscale/swscale.c > +++ b/libswscale/swscale.c > @@ -295,8 +295,8 @@ static int swscale(SwsContext *c, const uint8_t *src[], > srcStride[2] = > srcStride[3] = srcStride[0]; > } > - srcStride[1] <<= c->vChrDrop; > - srcStride[2] <<= c->vChrDrop; > + srcStride[1] *= 1 << c->vChrDrop; > + srcStride[2] *= 1 << c->vChrDrop; > > Also fixes the filter-crop_scale_vflip FATE-test. I presume the multiplication here can't overflow, so LGTM. - Andreas
On Wed, Jan 22, 2020 at 05:53:15AM +0100, Andreas Rheinhardt wrote: > On Tue, Jan 21, 2020 at 11:24 PM Michael Niedermayer <michael@niedermayer.cc> > wrote: > > > Fixes: Invalid shifts > > Fixes: #8166 > > > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libswscale/swscale.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/libswscale/swscale.c b/libswscale/swscale.c > > index 4ecfa88ff7..8436f056d4 100644 > > --- a/libswscale/swscale.c > > +++ b/libswscale/swscale.c > > @@ -295,8 +295,8 @@ static int swscale(SwsContext *c, const uint8_t *src[], > > srcStride[2] = > > srcStride[3] = srcStride[0]; > > } > > - srcStride[1] <<= c->vChrDrop; > > - srcStride[2] <<= c->vChrDrop; > > + srcStride[1] *= 1 << c->vChrDrop; > > + srcStride[2] *= 1 << c->vChrDrop; > > > > Also fixes the filter-crop_scale_vflip FATE-test. > I presume the multiplication here can't overflow, so LGTM. will apply thx [...]
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 4ecfa88ff7..8436f056d4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -295,8 +295,8 @@ static int swscale(SwsContext *c, const uint8_t *src[], srcStride[2] = srcStride[3] = srcStride[0]; } - srcStride[1] <<= c->vChrDrop; - srcStride[2] <<= c->vChrDrop; + srcStride[1] *= 1 << c->vChrDrop; + srcStride[2] *= 1 << c->vChrDrop; DEBUG_BUFFERS("swscale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n", src[0], srcStride[0], src[1], srcStride[1],
Fixes: Invalid shifts Fixes: #8166 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libswscale/swscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)