[FFmpeg-cvslog] lavfi/f_streamselect: drop useless query_formats() callback

Anton Khirnov git at videolan.org
Fri Oct 4 11:04:18 EEST 2024


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Oct  1 12:15:18 2024 +0200| [f10986a5ec25df772e1af7ce1c9011a1a4ed2893] | committer: Anton Khirnov

lavfi/f_streamselect: drop useless query_formats() callback

It achieves the same effect as ff_default_query_formats(), which gets
called implicitly.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f10986a5ec25df772e1af7ce1c9011a1a4ed2893
---

 libavfilter/f_streamselect.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c
index 4ff4e856ea..2afd22d4a3 100644
--- a/libavfilter/f_streamselect.c
+++ b/libavfilter/f_streamselect.c
@@ -296,31 +296,10 @@ static av_cold void uninit(AVFilterContext *ctx)
     ff_framesync_uninit(&s->fs);
 }
 
-static int query_formats(AVFilterContext *ctx)
-{
-    AVFilterFormats *formats;
-    int ret, i;
-
-    for (i = 0; i < ctx->nb_inputs; i++) {
-        formats = ff_all_formats(ctx->inputs[i]->type);
-        if ((ret = ff_set_common_formats(ctx, formats)) < 0)
-            return ret;
-
-        if (ctx->inputs[i]->type == AVMEDIA_TYPE_AUDIO) {
-            if ((ret = ff_set_common_all_samplerates   (ctx)) < 0 ||
-                (ret = ff_set_common_all_channel_counts(ctx)) < 0)
-                return ret;
-        }
-    }
-
-    return 0;
-}
-
 const AVFilter ff_vf_streamselect = {
     .name            = "streamselect",
     .description     = NULL_IF_CONFIG_SMALL("Select video streams"),
     .init            = init,
-    FILTER_QUERY_FUNC(query_formats),
     .process_command = process_command,
     .uninit          = uninit,
     .activate        = activate,
@@ -334,7 +313,6 @@ const AVFilter ff_af_astreamselect = {
     .description     = NULL_IF_CONFIG_SMALL("Select audio streams"),
     .priv_class      = &streamselect_class,
     .init            = init,
-    FILTER_QUERY_FUNC(query_formats),
     .process_command = process_command,
     .uninit          = uninit,
     .activate        = activate,



More information about the ffmpeg-cvslog mailing list