summaryrefslogtreecommitdiff
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-05-21 12:06:52 +0200
committerAnton Khirnov <anton@khirnov.net>2021-07-03 16:09:43 +0200
commite1889855983094ca74c494d29b33e482b1bba865 (patch)
tree59f645e9d9137c853ce1d46b222331c356e16372 /libswscale/swscale.c
parenta91e6c927e526f6a24336379148ff0e399afa852 (diff)
downloadffmpeg-e1889855983094ca74c494d29b33e482b1bba865.tar.gz
sws: move the early return for zero-sized slices higher up
Place it right after the input parameter validation. There is no point in performing any setup if the sws_scale() call won't do anything.
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 05544ea9fb..8471f112ac 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -897,6 +897,10 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
return AVERROR(EINVAL);
}
+ // do not mess up sliceDir if we have a "trailing" 0-size slice
+ if (srcSliceH == 0)
+ return 0;
+
if (c->gamma_flag && c->cascaded_context[0])
return scale_gamma(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride);
@@ -908,10 +912,6 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
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)
- return 0;
-
if (frame_start) {
if (srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");