ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Fri Oct 4 10:09:29 2024 +0200| [eff406f5dd551b55d3a98ac86b596ae3af64098d] | committer: Anton Khirnov
lavfi/vf_datascope: switch to query_func2() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eff406f5dd551b55d3a98ac86b596ae3af64098d --- libavfilter/vf_datascope.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c index 7b4cb52ee8..a4f6c69bfd 100644 --- a/libavfilter/vf_datascope.c +++ b/libavfilter/vf_datascope.c @@ -77,9 +77,12 @@ static const AVOption datascope_options[] = { AVFILTER_DEFINE_CLASS(datascope); -static int query_formats(AVFilterContext *ctx) +static int query_formats(const AVFilterContext *ctx, + AVFilterFormatsConfig **cfg_in, + AVFilterFormatsConfig **cfg_out) { - return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); + return ff_set_common_formats2(ctx, cfg_in, cfg_out, + ff_draw_supported_pixel_formats(0)); } static void draw_text(FFDrawContext *draw, AVFrame *frame, FFDrawColor *color, @@ -455,7 +458,7 @@ const AVFilter ff_vf_datascope = { .priv_class = &datascope_class, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SLICE_THREADS, .process_command = process_command, }; @@ -735,7 +738,7 @@ const AVFilter ff_vf_pixscope = { .priv_class = &pixscope_class, FILTER_INPUTS(pixscope_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = pixscope_process_command, }; @@ -1134,7 +1137,7 @@ const AVFilter ff_vf_oscilloscope = { .uninit = oscilloscope_uninit, FILTER_INPUTS(oscilloscope_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), - FILTER_QUERY_FUNC(query_formats), + FILTER_QUERY_FUNC2(query_formats), .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .process_command = oscilloscope_process_command, }; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
