diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-05-21 15:44:49 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-07-03 16:13:10 +0200 |
| commit | d6649d9a3badfae00b8735e6d8628ab2b856dccd (patch) | |
| tree | 3351eb9e685b879d978d16e796657fb0431e8f0c | |
| parent | e1889855983094ca74c494d29b33e482b1bba865 (diff) | |
| download | ffmpeg-d6649d9a3badfae00b8735e6d8628ab2b856dccd.tar.gz | |
sws: move initializing dither_error higher up
It does not interact in any way with the code setting up the image
pointers/strides, so it should not be intermixed with it.
| -rw-r--r-- | libswscale/swscale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 8471f112ac..d2286357b3 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -907,6 +907,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); + if (!srcSliceY && (c->flags & SWS_BITEXACT) && c->dither == SWS_DITHER_ED && c->dither_error[0]) + for (i = 0; i < 4; i++) + memset(c->dither_error[i], 0, sizeof(c->dither_error[0][0]) * (c->dstW+2)); + memcpy(src2, srcSlice, sizeof(src2)); memcpy(dst2, dst, sizeof(dst2)); memcpy(srcStride2, srcStride, sizeof(srcStride2)); @@ -959,10 +963,6 @@ int attribute_align_arg sws_scale(struct SwsContext *c, src2[0] = base; } - if (!srcSliceY && (c->flags & SWS_BITEXACT) && c->dither == SWS_DITHER_ED && c->dither_error[0]) - for (i = 0; i < 4; i++) - memset(c->dither_error[i], 0, sizeof(c->dither_error[0][0]) * (c->dstW+2)); - if (c->sliceDir != 1) { // slices go from bottom to top => we flip the image internally for (i=0; i<4; i++) { |