Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-05-19 12:50:28 +0300
committerAnton Khirnov <anton@khirnov.net>2021-07-03 16:31:08 +0300
commitc05cab34a9d53c6b948e3757385b9c2657608603 (patch)
tree568c8c1f62ea6e15855148d8716259de92fe9b84 /libswscale/swscale.c
parentd3d8e09640ed311320c2bb50d44d1d977512e972 (diff)
sws: initialize {src,dst}Stride2 consistently with {src,dst}2
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c11
1 files 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)