diff mbox series

[FFmpeg-devel,1/4] swscale/utils: reindent

Message ID 1592060736-3496-1-git-send-email-lance.lmwang@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,1/4] swscale/utils: reindent
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Limin Wang June 13, 2020, 3:05 p.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libswscale/utils.c | 71 +++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

Comments

Limin Wang June 13, 2020, 11:32 p.m. UTC | #1
Sorry, please ignore the repeat sending for 1,3,4. I haven't got them for a
while so I think something is wrong with client and resend. 


On Sat, Jun 13, 2020 at 11:05:36PM +0800, lance.lmwang@gmail.com wrote:
> From: Limin Wang <lance.lmwang@gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
>  libswscale/utils.c | 71 +++++++++++++++++++++++++++---------------------------
>  1 file changed, 36 insertions(+), 35 deletions(-)
> 
> diff --git a/libswscale/utils.c b/libswscale/utils.c
> index ff99e79..6e218ba 100644
> --- a/libswscale/utils.c
> +++ b/libswscale/utils.c
> @@ -1575,41 +1575,42 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
>      if (CONFIG_SWSCALE_ALPHA && isALPHA(srcFormat) && !isALPHA(dstFormat)) {
>          enum AVPixelFormat tmpFormat = alphaless_fmt(srcFormat);
>  
> -        if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE)
> -        if (!unscaled ||
> -            dstFormat != tmpFormat ||
> -            usesHFilter || usesVFilter ||
> -            c->srcRange != c->dstRange
> -        ) {
> -            c->cascaded_mainindex = 1;
> -            ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride,
> -                                srcW, srcH, tmpFormat, 64);
> -            if (ret < 0)
> -                return ret;
> -
> -            c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat,
> -                                                        srcW, srcH, tmpFormat,
> -                                                        flags, c->param);
> -            if (!c->cascaded_context[0])
> -                return -1;
> -            c->cascaded_context[0]->alphablend = c->alphablend;
> -            ret = sws_init_context(c->cascaded_context[0], NULL , NULL);
> -            if (ret < 0)
> -                return ret;
> -
> -            c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
> -                                                        dstW, dstH, dstFormat,
> -                                                        flags, c->param);
> -            if (!c->cascaded_context[1])
> -                return -1;
> -
> -            c->cascaded_context[1]->srcRange = c->srcRange;
> -            c->cascaded_context[1]->dstRange = c->dstRange;
> -            ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter);
> -            if (ret < 0)
> -                return ret;
> -
> -            return 0;
> +        if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE) {
> +            if (!unscaled ||
> +                dstFormat != tmpFormat ||
> +                usesHFilter || usesVFilter ||
> +                c->srcRange != c->dstRange
> +            ) {
> +                c->cascaded_mainindex = 1;
> +                ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride,
> +                                     srcW, srcH, tmpFormat, 64);
> +                if (ret < 0)
> +                    return ret;
> +
> +                c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat,
> +                                                            srcW, srcH, tmpFormat,
> +                                                            flags, c->param);
> +                if (!c->cascaded_context[0])
> +                    return -1;
> +                c->cascaded_context[0]->alphablend = c->alphablend;
> +                ret = sws_init_context(c->cascaded_context[0], NULL , NULL);
> +                if (ret < 0)
> +                    return ret;
> +
> +                c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
> +                                                            dstW, dstH, dstFormat,
> +                                                            flags, c->param);
> +                if (!c->cascaded_context[1])
> +                    return -1;
> +
> +                c->cascaded_context[1]->srcRange = c->srcRange;
> +                c->cascaded_context[1]->dstRange = c->dstRange;
> +                ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter);
> +                if (ret < 0)
> +                    return ret;
> +
> +                return 0;
> +            }
>          }
>      }
>  
> -- 
> 1.8.3.1
>
diff mbox series

Patch

diff --git a/libswscale/utils.c b/libswscale/utils.c
index ff99e79..6e218ba 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1575,41 +1575,42 @@  av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
     if (CONFIG_SWSCALE_ALPHA && isALPHA(srcFormat) && !isALPHA(dstFormat)) {
         enum AVPixelFormat tmpFormat = alphaless_fmt(srcFormat);
 
-        if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE)
-        if (!unscaled ||
-            dstFormat != tmpFormat ||
-            usesHFilter || usesVFilter ||
-            c->srcRange != c->dstRange
-        ) {
-            c->cascaded_mainindex = 1;
-            ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride,
-                                srcW, srcH, tmpFormat, 64);
-            if (ret < 0)
-                return ret;
-
-            c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat,
-                                                        srcW, srcH, tmpFormat,
-                                                        flags, c->param);
-            if (!c->cascaded_context[0])
-                return -1;
-            c->cascaded_context[0]->alphablend = c->alphablend;
-            ret = sws_init_context(c->cascaded_context[0], NULL , NULL);
-            if (ret < 0)
-                return ret;
-
-            c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
-                                                        dstW, dstH, dstFormat,
-                                                        flags, c->param);
-            if (!c->cascaded_context[1])
-                return -1;
-
-            c->cascaded_context[1]->srcRange = c->srcRange;
-            c->cascaded_context[1]->dstRange = c->dstRange;
-            ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter);
-            if (ret < 0)
-                return ret;
-
-            return 0;
+        if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE) {
+            if (!unscaled ||
+                dstFormat != tmpFormat ||
+                usesHFilter || usesVFilter ||
+                c->srcRange != c->dstRange
+            ) {
+                c->cascaded_mainindex = 1;
+                ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride,
+                                     srcW, srcH, tmpFormat, 64);
+                if (ret < 0)
+                    return ret;
+
+                c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat,
+                                                            srcW, srcH, tmpFormat,
+                                                            flags, c->param);
+                if (!c->cascaded_context[0])
+                    return -1;
+                c->cascaded_context[0]->alphablend = c->alphablend;
+                ret = sws_init_context(c->cascaded_context[0], NULL , NULL);
+                if (ret < 0)
+                    return ret;
+
+                c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat,
+                                                            dstW, dstH, dstFormat,
+                                                            flags, c->param);
+                if (!c->cascaded_context[1])
+                    return -1;
+
+                c->cascaded_context[1]->srcRange = c->srcRange;
+                c->cascaded_context[1]->dstRange = c->dstRange;
+                ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter);
+                if (ret < 0)
+                    return ret;
+
+                return 0;
+            }
         }
     }