[FFmpeg-cvslog] sws: merge handling frame start into a single block

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu May 20 17:02:16 2021 +0200| [ff753f41dd3dbe7b71c314ecfe4b9dd89e059f57] | committer: Anton Khirnov

sws: merge handling frame start into a single block

Also, return an error code on failure rather than 0.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff753f41dd3dbe7b71c314ecfe4b9dd89e059f57
---

 libswscale/swscale.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 0f05ba01f6..62a172d4ec 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -912,11 +912,12 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
     if (srcSliceH == 0)
         return 0;
 
-    if (frame_start && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
-        av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");
-        return 0;
-    }
     if (frame_start) {
+        if (srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
+            av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");
+            return AVERROR(EINVAL);
+        }
+
         if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1;
     }