[FFmpeg-cvslog] [ffmpeg] branch master updated. 05b6b30ee1 fftools/ffplay: set the alphamodes buffersink array option instead of the binary one

[ffmpeg-git]

The branch, master has been updated
       via  05b6b30ee166e3efee95173a373c2076c5d3c7dd (commit)
       via  23b759e99ed65b8eb3eca0e976d75285d8485b80 (commit)
      from  e9a6b753739fe5b314911ff6c8da673c5bce5f63 (commit)


- Log -----------------------------------------------------------------
commit 05b6b30ee166e3efee95173a373c2076c5d3c7dd
Author:     James Almer <jamr...@gmail.com>
AuthorDate: Mon Sep 8 15:08:49 2025 -0300
Commit:     James Almer <jamr...@gmail.com>
CommitDate: Mon Sep 8 18:38:16 2025 -0300

    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 <jamr...@gmail.com>

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)

commit 23b759e99ed65b8eb3eca0e976d75285d8485b80
Author:     James Almer <jamr...@gmail.com>
AuthorDate: Mon Sep 8 15:07:20 2025 -0300
Commit:     James Almer <jamr...@gmail.com>
CommitDate: Mon Sep 8 18:38:16 2025 -0300

    avfilter/buffersink: add missing checks for alphamodes
    
    Signed-off-by: James Almer <jamr...@gmail.com>

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);

-----------------------------------------------------------------------

Summary of changes:
 fftools/ffplay.c         | 3 ++-
 libavfilter/buffersink.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list -- ffmpeg-cvslog@ffmpeg.org
To unsubscribe send an email to ffmpeg-cvslog-le...@ffmpeg.org