diff mbox series

[FFmpeg-devel] lavfi/frei0r: Remove duplicated pix_fmt entry

Message ID 20201116193358.408921-1-derek.buitenhuis@gmail.com
State Accepted
Commit 04340e5e018603df5a158a5cddf81530005d8d2f
Headers show
Series [FFmpeg-devel] lavfi/frei0r: Remove duplicated pix_fmt entry | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished

Commit Message

Derek Buitenhuis Nov. 16, 2020, 7:33 p.m. UTC 
From: Andrew Rodland <andrew@cleverdomain.org>

Fixes e.g. 'ffmpeg -i input.mp4 -vf frei0r=pixeliz0r output.mp4':

    [Parsed_frei0r_0 @ 0x5585b8093280] Duplicated pixel format
    Error reinitializing filters!
    Failed to inject frame into filter network: Invalid argument
    Error while processing the decoded data for stream #0:0
    Conversion failed!

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavfilter/vf_frei0r.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Nov. 16, 2020, 9:26 p.m. UTC | #1 
LGTM

On Mon, Nov 16, 2020 at 10:23 PM Derek Buitenhuis <
derek.buitenhuis@gmail.com> wrote:

> From: Andrew Rodland <andrew@cleverdomain.org>
>
> Fixes e.g. 'ffmpeg -i input.mp4 -vf frei0r=pixeliz0r output.mp4':
>
>     [Parsed_frei0r_0 @ 0x5585b8093280] Duplicated pixel format
>     Error reinitializing filters!
>     Failed to inject frame into filter network: Invalid argument
>     Error while processing the decoded data for stream #0:0
>     Conversion failed!
>
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  libavfilter/vf_frei0r.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
> index 5d38405999..dd94452d10 100644
> --- a/libavfilter/vf_frei0r.c
> +++ b/libavfilter/vf_frei0r.c
> @@ -338,7 +338,7 @@ static int query_formats(AVFilterContext *ctx)
>              return ret;
>      } else {                                   /*
> F0R_COLOR_MODEL_PACKED32 */
>          static const enum AVPixelFormat pix_fmts[] = {
> -            AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR,
> AV_PIX_FMT_ARGB, AV_PIX_FMT_NONE
> +            AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR,
> AV_PIX_FMT_NONE
>          };
>          formats = ff_make_format_list(pix_fmts);
>      }
> --
> 2.29.2
>
> _______________________________________________
> 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".
Derek Buitenhuis Nov. 16, 2020, 9:50 p.m. UTC | #2 
On 16/11/2020 21:26, Paul B Mahol wrote:
> LGTM

Pushed, thanks.

- Derek
diff mbox series

Patch

diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 5d38405999..dd94452d10 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -338,7 +338,7 @@  static int query_formats(AVFilterContext *ctx)
             return ret;
     } else {                                   /* F0R_COLOR_MODEL_PACKED32 */
         static const enum AVPixelFormat pix_fmts[] = {
-            AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_ARGB, AV_PIX_FMT_NONE
+            AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_NONE
         };
         formats = ff_make_format_list(pix_fmts);
     }