[FFmpeg-devel] [PATCH 2/3] swscale/swscale: Fix several invalid shifts related to vChrDrop

Michael Niedermayer michael at niedermayer.cc
Wed Jan 22 16:35:47 EET 2020


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 at niedermayer.cc>
> wrote:
> 
> > Fixes: Invalid shifts
> > Fixes: #8166
> >
> > Signed-off-by: Michael Niedermayer <michael at 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

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20200122/2fbbec04/attachment.sig>


More information about the ffmpeg-devel mailing list