summaryrefslogtreecommitdiff
path: root/libavfilter/avfiltergraph.c
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2021-08-19 16:58:20 +0200
committerNicolas George <george@nsup.org>2021-08-20 10:26:36 +0200
commit24de2b7618cc0ed9e75398750b95a2fe88ccaf8c (patch)
treeff03cd3b1d92e7c1fcce5b96bc08cddd86d6bf2a /libavfilter/avfiltergraph.c
parent703c3c4151bf47a03ddf168f67a8b1a46834c791 (diff)
lavfi/formats: rename AVFilterNegotiation.nb to nb_mergers
Diffstat (limited to 'libavfilter/avfiltergraph.c')
-rw-r--r--libavfilter/avfiltergraph.c6
1 files changed, 3 insertions, 3 deletions
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);