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/af_headphone.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/af_headphone.c')
| -rw-r--r-- | libavfilter/af_headphone.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c index da5acdce30..58d82ac41d 100644 --- a/libavfilter/af_headphone.c +++ b/libavfilter/af_headphone.c @@ -698,14 +698,14 @@ static int query_formats(AVFilterContext *ctx) if (!layouts) return AVERROR(ENOMEM); - ret = ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts); + ret = ff_channel_layouts_ref(layouts, &ctx->inputs[0]->outcfg.channel_layouts); if (ret) return ret; ret = ff_add_channel_layout(&stereo_layout, AV_CH_LAYOUT_STEREO); if (ret) return ret; - ret = ff_channel_layouts_ref(stereo_layout, &ctx->outputs[0]->in_channel_layouts); + ret = ff_channel_layouts_ref(stereo_layout, &ctx->outputs[0]->incfg.channel_layouts); if (ret) return ret; @@ -713,12 +713,12 @@ static int query_formats(AVFilterContext *ctx) hrir_layouts = ff_all_channel_counts(); if (!hrir_layouts) return AVERROR(ENOMEM); - ret = ff_channel_layouts_ref(hrir_layouts, &ctx->inputs[1]->out_channel_layouts); + ret = ff_channel_layouts_ref(hrir_layouts, &ctx->inputs[1]->outcfg.channel_layouts); if (ret) return ret; } else { for (i = 1; i < s->nb_inputs; i++) { - ret = ff_channel_layouts_ref(stereo_layout, &ctx->inputs[i]->out_channel_layouts); + ret = ff_channel_layouts_ref(stereo_layout, &ctx->inputs[i]->outcfg.channel_layouts); if (ret) return ret; } |