From c05cab34a9d53c6b948e3757385b9c2657608603 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 19 May 2021 11:50:28 +0200 Subject: sws: initialize {src,dst}Stride2 consistently with {src,dst}2 --- libswscale/swscale.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7dbe0f59c5..1cf89e4684 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -883,11 +883,6 @@ int attribute_align_arg sws_scale(struct SwsContext *c, return AVERROR(EINVAL); } - for (i=0; i<4; i++) { - srcStride2[i] = srcStride[i]; - dstStride2[i] = dstStride[i]; - } - if ((srcSliceY & (macro_height-1)) || ((srcSliceH& (macro_height-1)) && srcSliceY + srcSliceH != c->srcH) || srcSliceY + srcSliceH > c->srcH) { @@ -901,8 +896,10 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (c->cascaded_context[0] && srcSliceY == 0 && srcSliceH == c->cascaded_context[0]->srcH) return scale_cascaded(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride); - memcpy(src2, srcSlice, sizeof(src2)); - memcpy(dst2, dst, sizeof(dst2)); + memcpy(src2, srcSlice, sizeof(src2)); + memcpy(dst2, dst, sizeof(dst2)); + memcpy(srcStride2, srcStride, sizeof(srcStride2)); + memcpy(dstStride2, dstStride, sizeof(dstStride2)); // do not mess up sliceDir if we have a "trailing" 0-size slice if (srcSliceH == 0) -- cgit v1.2.3