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/avf_aphasemeter.c | |
parent | 6a2df7ca26cf31b36facdb14ede9ebeb4bce8773 (diff) |
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/avf_aphasemeter.c')
-rw-r--r-- | libavfilter/avf_aphasemeter.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index 53d1de29d3..31fc8b1b3f 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -76,23 +76,23 @@ static int query_formats(AVFilterContext *ctx) int ret; formats = ff_make_format_list(sample_fmts); - if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || - (ret = ff_formats_ref (formats, &outlink->in_formats )) < 0 || + if ((ret = ff_formats_ref (formats, &inlink->outcfg.formats )) < 0 || + (ret = ff_formats_ref (formats, &outlink->incfg.formats )) < 0 || (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || - (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0 || - (ret = ff_channel_layouts_ref (layout , &outlink->in_channel_layouts)) < 0) + (ret = ff_channel_layouts_ref (layout , &inlink->outcfg.channel_layouts)) < 0 || + (ret = ff_channel_layouts_ref (layout , &outlink->incfg.channel_layouts)) < 0) return ret; formats = ff_all_samplerates(); - if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0 || - (ret = ff_formats_ref(formats, &outlink->in_samplerates)) < 0) + if ((ret = ff_formats_ref(formats, &inlink->outcfg.samplerates)) < 0 || + (ret = ff_formats_ref(formats, &outlink->incfg.samplerates)) < 0) return ret; if (s->do_video) { AVFilterLink *outlink = ctx->outputs[1]; formats = ff_make_format_list(pix_fmts); - if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) + if ((ret = ff_formats_ref(formats, &outlink->incfg.formats)) < 0) return ret; } |