From 24de2b7618cc0ed9e75398750b95a2fe88ccaf8c Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Thu, 19 Aug 2021 16:58:20 +0200 Subject: lavfi/formats: rename AVFilterNegotiation.nb to nb_mergers --- libavfilter/avfiltergraph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavfilter/avfiltergraph.c') diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 41a91a9bda..8c6d43a0c7 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -465,7 +465,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) neg = ff_filter_get_negotiation(link); av_assert0(neg); - for (neg_step = 1; neg_step < neg->nb; neg_step++) { + for (neg_step = 1; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; void *a = FF_FIELD_AT(void *, m->offset, link->incfg); void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); @@ -474,7 +474,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) break; } } - for (neg_step = 0; neg_step < neg->nb; neg_step++) { + for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; void *a = FF_FIELD_AT(void *, m->offset, link->incfg); void *b = FF_FIELD_AT(void *, m->offset, link->outcfg); @@ -542,7 +542,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) av_assert0(outlink-> incfg.channel_layouts->refcount > 0); av_assert0(outlink->outcfg.channel_layouts->refcount > 0); } - for (neg_step = 0; neg_step < neg->nb; neg_step++) { + for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) { const AVFilterFormatsMerger *m = &neg->mergers[neg_step]; void *ia = FF_FIELD_AT(void *, m->offset, inlink->incfg); void *ib = FF_FIELD_AT(void *, m->offset, inlink->outcfg); -- cgit v1.2.3