[FFmpeg-cvslog] lavfi/vf_overlay_qsv: switch to query_func2()

Anton Khirnov git at videolan.org
Tue Oct 15 11:44:52 EEST 2024


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Oct 12 18:28:12 2024 +0200| [64035fe2069a2cccaa47393c0b6d4b1f7cfc805d] | committer: Anton Khirnov

lavfi/vf_overlay_qsv: switch to query_func2()

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

 libavfilter/vf_overlay_qsv.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c
index 39bc700637..17da4a4d1a 100644
--- a/libavfilter/vf_overlay_qsv.c
+++ b/libavfilter/vf_overlay_qsv.c
@@ -366,7 +366,9 @@ static int activate(AVFilterContext *ctx)
     return ff_framesync_activate(&s->fs);
 }
 
-static int overlay_qsv_query_formats(AVFilterContext *ctx)
+static int overlay_qsv_query_formats(const AVFilterContext *ctx,
+                                     AVFilterFormatsConfig **cfg_in,
+                                     AVFilterFormatsConfig **cfg_out)
 {
     int i;
     int ret;
@@ -386,12 +388,12 @@ static int overlay_qsv_query_formats(AVFilterContext *ctx)
     };
 
     for (i = 0; i < ctx->nb_inputs; i++) {
-        ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &ctx->inputs[i]->outcfg.formats);
+        ret = ff_formats_ref(ff_make_format_list(main_in_fmts), &cfg_in[i]->formats);
         if (ret < 0)
             return ret;
     }
 
-    ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats);
+    ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &cfg_out[0]->formats);
     if (ret < 0)
         return ret;
 
@@ -431,7 +433,7 @@ const AVFilter ff_vf_overlay_qsv = {
     .activate       = activate,
     FILTER_INPUTS(overlay_qsv_inputs),
     FILTER_OUTPUTS(overlay_qsv_outputs),
-    FILTER_QUERY_FUNC(overlay_qsv_query_formats),
+    FILTER_QUERY_FUNC2(overlay_qsv_query_formats),
     .priv_class     = &overlay_qsv_class,
     .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
     .flags          = AVFILTER_FLAG_HWDEVICE,



More information about the ffmpeg-cvslog mailing list