X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libswscale%2Fswscale.c;h=ba66314c7d46a4ec4406dac686ff6c9cc558fc92;hb=2eab48177d74782cf948e7ae13aef2ee5d7ab1c1;hp=eb2f182ce62c54d15510cdb6f76fff1a3dc20ebb;hpb=7e9474ca47fd4d267bdafcc8162fded67f6410e5;p=ffmpeg diff --git a/libswscale/swscale.c b/libswscale/swscale.c index eb2f182ce62..ba66314c7d4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -762,10 +762,8 @@ int attribute_align_arg sws_scale(struct SwsContext *c, uint8_t *rgb0_tmp = NULL; int macro_height = isBayer(c->srcFormat) ? 2 : (1 << c->chrSrcVSubSample); // copy strides, so they can safely be modified - int srcStride2[4] = { srcStride[0], srcStride[1], srcStride[2], - srcStride[3] }; - int dstStride2[4] = { dstStride[0], dstStride[1], dstStride[2], - dstStride[3] }; + int srcStride2[4]; + int dstStride2[4]; int srcSliceY_internal = srcSliceY; if (!srcStride || !dstStride || !dst || !srcSlice) { @@ -773,6 +771,11 @@ int attribute_align_arg sws_scale(struct SwsContext *c, return 0; } + 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) {