aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-01-21 22:52:19 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-03 12:10:23 +0200
commit0ec11133d928f0d64531528c8bf4c04d9b314046 (patch)
tree9153ff75e5b5331feb1615a2d28ac7030a914be1
parent88326e29dc683b6168cb697773abf1fd9059cadf (diff)
downloadffmpeg-0ec11133d928f0d64531528c8bf4c04d9b314046.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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 40695503ad..36f7aa9a03 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -300,8 +300,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],