ffmpeg | branch: master | Andreas Rheinhardt <[email protected]> | Wed Nov 1 08:33:26 2023 +0100| [a02670ded71ef718799799d9f92b65c02852bd40] | committer: Andreas Rheinhardt
avfilter/f_drawgraph: Deduplicate outputs Signed-off-by: Andreas Rheinhardt <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a02670ded71ef718799799d9f92b65c02852bd40 --- libavfilter/f_drawgraph.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index d29a7fb60a..d53598ee15 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -454,22 +454,22 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->values[3]); } -#if CONFIG_DRAWGRAPH_FILTER - -static const AVFilterPad drawgraph_inputs[] = { +static const AVFilterPad drawgraph_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = filter_frame, + .config_props = config_output, + .request_frame = request_frame, }, }; -static const AVFilterPad drawgraph_outputs[] = { +#if CONFIG_DRAWGRAPH_FILTER + +static const AVFilterPad drawgraph_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - .request_frame = request_frame, + .filter_frame = filter_frame, }, }; @@ -497,15 +497,6 @@ static const AVFilterPad adrawgraph_inputs[] = { }, }; -static const AVFilterPad adrawgraph_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - .request_frame = request_frame, - }, -}; - const AVFilter ff_avf_adrawgraph = { .name = "adrawgraph", .description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio metadata."), @@ -514,7 +505,7 @@ const AVFilter ff_avf_adrawgraph = { .init = init, .uninit = uninit, FILTER_INPUTS(adrawgraph_inputs), - FILTER_OUTPUTS(adrawgraph_outputs), + FILTER_OUTPUTS(drawgraph_outputs), FILTER_QUERY_FUNC(query_formats), }; #endif // CONFIG_ADRAWGRAPH_FILTER _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
