diff options
| author | Nicolas George <george@nsup.org> | 2021-08-19 16:58:20 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2021-08-20 10:26:36 +0200 |
| commit | 24de2b7618cc0ed9e75398750b95a2fe88ccaf8c (patch) | |
| tree | ff03cd3b1d92e7c1fcce5b96bc08cddd86d6bf2a | |
| parent | 703c3c4151bf47a03ddf168f67a8b1a46834c791 (diff) | |
| download | ffmpeg-24de2b7618cc0ed9e75398750b95a2fe88ccaf8c.tar.gz | |
lavfi/formats: rename AVFilterNegotiation.nb to nb_mergers
| -rw-r--r-- | libavfilter/avfiltergraph.c | 6 | ||||
| -rw-r--r-- | libavfilter/formats.c | 4 | ||||
| -rw-r--r-- | libavfilter/formats.h | 2 |
3 files changed, 6 insertions, 6 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); diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 9e39d65a3c..ca85b4094b 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -327,14 +327,14 @@ static const AVFilterFormatsMerger mergers_audio[] = { }; static const AVFilterNegotiation negotiate_video = { - .nb = FF_ARRAY_ELEMS(mergers_video), + .nb_mergers = FF_ARRAY_ELEMS(mergers_video), .mergers = mergers_video, .conversion_filter = "scale", .conversion_opts_offset = offsetof(AVFilterGraph, scale_sws_opts), }; static const AVFilterNegotiation negotiate_audio = { - .nb = FF_ARRAY_ELEMS(mergers_audio), + .nb_mergers = FF_ARRAY_ELEMS(mergers_audio), .mergers = mergers_audio, .conversion_filter = "aresample", .conversion_opts_offset = offsetof(AVFilterGraph, aresample_swr_opts), diff --git a/libavfilter/formats.h b/libavfilter/formats.h index a9cfa14e95..d94977a3aa 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -322,7 +322,7 @@ typedef struct AVFilterFormatMerger { } AVFilterFormatsMerger; typedef struct AVFilterNegotiation { - unsigned nb; + unsigned nb_mergers; const AVFilterFormatsMerger *mergers; const char *conversion_filter; unsigned conversion_opts_offset; |