[FFmpeg-devel] [PATCH 06/24] sws: cosmetics

Anton Khirnov anton at khirnov.net
Mon May 31 10:54:57 EEST 2021


Reindent after previous commit, split long lines.
---
 libswscale/swscale.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 876dc05442..72285c3547 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -816,27 +816,30 @@ static int scale_gamma(SwsContext *c,
                        int srcSliceY, int srcSliceH,
                        uint8_t * const dst[], const int dstStride[])
 {
-        int ret = sws_scale(c->cascaded_context[0],
-                    srcSlice, srcStride, srcSliceY, srcSliceH,
-                    c->cascaded_tmp, c->cascaded_tmpStride);
+    int ret = sws_scale(c->cascaded_context[0],
+                        srcSlice, srcStride, srcSliceY, srcSliceH,
+                        c->cascaded_tmp, c->cascaded_tmpStride);
 
-        if (ret < 0)
-            return ret;
+    if (ret < 0)
+        return ret;
 
-        if (c->cascaded_context[2])
-            ret = sws_scale(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp, c->cascaded_tmpStride, srcSliceY, srcSliceH, c->cascaded1_tmp, c->cascaded1_tmpStride);
-        else
-            ret = sws_scale(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp, c->cascaded_tmpStride, srcSliceY, srcSliceH, dst, dstStride);
+    if (c->cascaded_context[2])
+        ret = sws_scale(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp,
+                        c->cascaded_tmpStride, srcSliceY, srcSliceH, c->cascaded1_tmp,
+                        c->cascaded1_tmpStride);
+    else
+        ret = sws_scale(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp,
+                        c->cascaded_tmpStride, srcSliceY, srcSliceH, dst, dstStride);
 
-        if (ret < 0)
-            return ret;
-
-        if (c->cascaded_context[2]) {
-            ret = sws_scale(c->cascaded_context[2],
-                        (const uint8_t * const *)c->cascaded1_tmp, c->cascaded1_tmpStride, c->cascaded_context[1]->dstY - ret, c->cascaded_context[1]->dstY,
-                        dst, dstStride);
-        }
+    if (ret < 0)
         return ret;
+
+    if (c->cascaded_context[2]) {
+        ret = sws_scale(c->cascaded_context[2], (const uint8_t * const *)c->cascaded1_tmp,
+                        c->cascaded1_tmpStride, c->cascaded_context[1]->dstY - ret,
+                        c->cascaded_context[1]->dstY, dst, dstStride);
+    }
+    return ret;
 }
 
 /**
-- 
2.30.2



More information about the ffmpeg-devel mailing list