[FFmpeg-devel] [PATCH] avfilter/buffersink: add missing checks for alphamodes (PR #20469)

[James Almer via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20469 opened by James Almer (jamrial)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20469
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20469.patch


>From b186d5443afc5eda3c478c61eb8a29fc3821a898 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Mon, 8 Sep 2025 15:07:20 -0300
Subject: [PATCH 1/2] avfilter/buffersink: add missing checks for alphamodes

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavfilter/buffersink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index f636d3728f..c2d1efa78c 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -181,7 +181,7 @@ static av_cold int common_init(AVFilterContext *ctx)
 
     if (ctx->input_pads[0].type == AVMEDIA_TYPE_VIDEO) {
         if ((buf->pixel_fmts_size || buf->color_spaces_size || buf->color_ranges_size || buf->alpha_modes_size) &&
-            (buf->nb_pixel_formats || buf->nb_colorspaces || buf->nb_colorranges)) {
+            (buf->nb_pixel_formats || buf->nb_colorspaces || buf->nb_colorranges || buf->nb_alphamodes)) {
             av_log(ctx, AV_LOG_ERROR, "Cannot combine old and new format lists\n");
             return AVERROR(EINVAL);
         }
@@ -400,7 +400,7 @@ static int vsink_query_formats(const AVFilterContext *ctx,
     int ret;
 
 #if FF_API_BUFFERSINK_OPTS
-    if (buf->nb_pixel_formats || buf->nb_colorspaces || buf->nb_colorranges) {
+    if (buf->nb_pixel_formats || buf->nb_colorspaces || buf->nb_colorranges || buf->nb_alphamodes) {
 #endif
         if (buf->nb_pixel_formats) {
             ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, buf->pixel_formats);
-- 
2.49.1


>From 5e2876349253560a4a3207eda365523c2e4843b0 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Mon, 8 Sep 2025 15:08:49 -0300
Subject: [PATCH 2/2] fftools/ffplay: set the alphamodes buffersink array
 option instead of the binary one

And add the missing goto fail. This should ensure the alpha mode is set and remove
bogus warnings printed by ffplay.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffplay.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 05eadb69a6..dc2627521e 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -1938,9 +1938,10 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
                                 AV_OPT_TYPE_INT, sdl_supported_color_spaces)) < 0)
         goto fail;
 
-    if ((ret = av_opt_set_array(filt_out, "alpha_modes", AV_OPT_SEARCH_CHILDREN,
+    if ((ret = av_opt_set_array(filt_out, "alphamodes", AV_OPT_SEARCH_CHILDREN,
                                 0, FF_ARRAY_ELEMS(sdl_supported_alpha_modes),
                                 AV_OPT_TYPE_INT, sdl_supported_alpha_modes)) < 0)
+        goto fail;
 
     ret = avfilter_init_dict(filt_out, NULL);
     if (ret < 0)
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org