[FFmpeg-devel] [PATCH 15/24] sws: merge handling frame start into a single block

[Anton Khirnov]

Also, return an error code on failure rather than 0.
---
 libswscale/swscale.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 74da1bf42c..73bc0c5617 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;
     }
 
-- 
2.30.2