videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

lavfi/formats: rename AVFilterNegotiation.nb to nb_mergers

This commit is contained in:
Nicolas George 2021-08-19 16:58:20 +02:00
parent 703c3c4151
commit 24de2b7618
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/avfiltergraph.c
View File

@ -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);

4
libavfilter/formats.c
View File

@ -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),

2
libavfilter/formats.h
View File

@ -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;