[FFmpeg-devel] [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

[FFmpeg-devel] [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

[Paul B Mahol]

[-- Attachment #1: Type: text/plain, Size: 10 bytes --]

Attached.

[-- Attachment #2: 0001-avfilter-avfiltergraph-fix-illogical-flaws-in-code.patch --]
[-- Type: text/x-patch, Size: 1133 bytes --]

From 11907ee612b0440faeb3804e8f9af5e36a63db89 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Fri, 12 May 2023 21:01:41 +0200
Subject: [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavfilter/avfiltergraph.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 53f468494d..744f480e1d 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -748,8 +748,10 @@ static int reduce_formats_on_filter(AVFilterContext *filter)
                 (KNOWN(fmt) || fmts->all_counts)) {
                 /* Turn the infinite list into a singleton */
                 fmts->all_layouts = fmts->all_counts  = 0;
-                if (ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt) < 0)
-                    ret = 1;
+                ret = ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt);
+                if (ret < 0)
+                    return ret;
+                ret = 1;
                 break;
             }
 
-- 
2.39.1


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

[James Almer]

On 5/12/2023 5:49 PM, Paul B Mahol wrote:
> Attached.

> From 11907ee612b0440faeb3804e8f9af5e36a63db89 Mon Sep 17 00:00:00 2001
> From: Paul B Mahol <onemda@gmail.com>
> Date: Fri, 12 May 2023 21:01:41 +0200
> Subject: [PATCH] avfilter/avfiltergraph: fix illogical flaws in code
> 
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavfilter/avfiltergraph.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
> index 53f468494d..744f480e1d 100644
> --- a/libavfilter/avfiltergraph.c
> +++ b/libavfilter/avfiltergraph.c
> @@ -748,8 +748,10 @@ static int reduce_formats_on_filter(AVFilterContext *filter)
>                  (KNOWN(fmt) || fmts->all_counts)) {
>                  /* Turn the infinite list into a singleton */
>                  fmts->all_layouts = fmts->all_counts  = 0;
> -                if (ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt) < 0)
> -                    ret = 1;
> +                ret = ff_add_channel_layout(&outlink->incfg.channel_layouts, fmt);
> +                if (ret < 0)
> +                    return ret;
> +                ret = 1;
>                  break;
>              }

Probably ok.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

[Paul B Mahol]

Will apply, as it makes less frustrated filtergraphs with no excessive
aformat filters for cases that can negotiate formats fully.
Addresses #6638 ticket too.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

[Anton Khirnov]

Quoting Paul B Mahol (2023-05-12 22:49:07)
> Attached.
> 
> From 11907ee612b0440faeb3804e8f9af5e36a63db89 Mon Sep 17 00:00:00 2001
> From: Paul B Mahol <onemda@gmail.com>
> Date: Fri, 12 May 2023 21:01:41 +0200
> Subject: [PATCH] avfilter/avfiltergraph: fix illogical flaws in code

This commit message is useless. It should say what is the actual problem
that is being fixed.

-- 
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".