diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-01-21 22:52:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-04-23 21:29:01 +0200 |
| commit | f355bb59d87028e0b17e833efe79f7730e840f78 (patch) | |
| tree | d7310c96a4a0ee929fd52021b33fe965503ef984 | |
| parent | 51f6e2d7b8c7e423acbb4c527b05c9256d07632d (diff) | |
| download | ffmpeg-f355bb59d87028e0b17e833efe79f7730e840f78.tar.gz | |
swscale/swscale: Fix several invalid shifts related to vChrDrop
Fixes: Invalid shifts
Fixes: #8166
Fixes: filter-crop_scale_vflip FATE-test
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a6ca22c11834c0ff075592e3f051d41068c407db)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswscale/swscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index c766b042fd..18974e475e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -413,8 +413,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], |