diff options
| author | Nicolas George <george@nsup.org> | 2020-08-24 12:16:34 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2020-09-08 14:02:40 +0200 |
| commit | 2f76476549a01ae2c4ec2a440e4b14c5aba64869 (patch) | |
| tree | f9e33f27250dffb1779469ff792df59f4431d421 /libavfilter/vf_mergeplanes.c | |
| parent | 6a2df7ca26cf31b36facdb14ede9ebeb4bce8773 (diff) | |
| download | ffmpeg-2f76476549a01ae2c4ec2a440e4b14c5aba64869.tar.gz | |
lavfi: regroup formats lists in a single structure.
It will allow to refernce it as a whole without clunky macros.
Most of the changes have been automatically made with sed:
sed -i '
s/-> *in_formats/->incfg.formats/g;
s/-> *out_formats/->outcfg.formats/g;
s/-> *in_channel_layouts/->incfg.channel_layouts/g;
s/-> *out_channel_layouts/->outcfg.channel_layouts/g;
s/-> *in_samplerates/->incfg.samplerates/g;
s/-> *out_samplerates/->outcfg.samplerates/g;
' src/libavfilter/*(.)
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
| -rw-r--r-- | libavfilter/vf_mergeplanes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index 4b4f91be5d..22eb36a2e1 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -122,12 +122,12 @@ static int query_formats(AVFilterContext *ctx) } for (i = 0; i < s->nb_inputs; i++) - if ((ret = ff_formats_ref(formats, &ctx->inputs[i]->out_formats)) < 0) + if ((ret = ff_formats_ref(formats, &ctx->inputs[i]->outcfg.formats)) < 0) return ret; formats = NULL; if ((ret = ff_add_format(&formats, s->out_fmt)) < 0 || - (ret = ff_formats_ref(formats, &ctx->outputs[0]->in_formats)) < 0) + (ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) return ret; return 0; |