RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/avf_concat: switch to query_func2()

This commit is contained in:
Anton Khirnov 2024-09-25 10:29:01 +02:00
parent a36cea452f
commit d36c368bf3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavfilter/avf_concat.c
View File

@ -72,9 +72,11 @@ static const AVOption concat_options[] = {
AVFILTER_DEFINE_CLASS(concat); AVFILTER_DEFINE_CLASS(concat);
static int query_formats(AVFilterContext *ctx) static int query_formats(const AVFilterContext *ctx,
AVFilterFormatsConfig **cfg_in,
AVFilterFormatsConfig **cfg_out)
{ {
ConcatContext *cat = ctx->priv; const ConcatContext *cat = ctx->priv;
unsigned type, nb_str, idx0 = 0, idx, str, seg; unsigned type, nb_str, idx0 = 0, idx, str, seg;
AVFilterFormats *formats, *rates = NULL; AVFilterFormats *formats, *rates = NULL;
AVFilterChannelLayouts *layouts = NULL; AVFilterChannelLayouts *layouts = NULL;
@ -87,25 +89,25 @@ static int query_formats(AVFilterContext *ctx)
/* Set the output formats */ /* Set the output formats */
formats = ff_all_formats(type); formats = ff_all_formats(type);
if ((ret = ff_formats_ref(formats, &ctx->outputs[idx]->incfg.formats)) < 0) if ((ret = ff_formats_ref(formats, &cfg_out[idx]->formats)) < 0)
return ret; return ret;
if (type == AVMEDIA_TYPE_AUDIO) { if (type == AVMEDIA_TYPE_AUDIO) {
rates = ff_all_samplerates(); rates = ff_all_samplerates();
if ((ret = ff_formats_ref(rates, &ctx->outputs[idx]->incfg.samplerates)) < 0) if ((ret = ff_formats_ref(rates, &cfg_out[idx]->samplerates)) < 0)
return ret; return ret;
layouts = ff_all_channel_layouts(); layouts = ff_all_channel_layouts();
if ((ret = ff_channel_layouts_ref(layouts, &ctx->outputs[idx]->incfg.channel_layouts)) < 0) if ((ret = ff_channel_layouts_ref(layouts, &cfg_out[idx]->channel_layouts)) < 0)
return ret; return ret;
} }
/* Set the same formats for each corresponding input */ /* Set the same formats for each corresponding input */
for (seg = 0; seg < cat->nb_segments; seg++) { for (seg = 0; seg < cat->nb_segments; seg++) {
if ((ret = ff_formats_ref(formats, &ctx->inputs[idx]->outcfg.formats)) < 0) if ((ret = ff_formats_ref(formats, &cfg_in[idx]->formats)) < 0)
return ret; return ret;
if (type == AVMEDIA_TYPE_AUDIO) { if (type == AVMEDIA_TYPE_AUDIO) {
if ((ret = ff_formats_ref(rates, &ctx->inputs[idx]->outcfg.samplerates)) < 0 || if ((ret = ff_formats_ref(rates, &cfg_in[idx]->samplerates)) < 0 ||
(ret = ff_channel_layouts_ref(layouts, &ctx->inputs[idx]->outcfg.channel_layouts)) < 0) (ret = ff_channel_layouts_ref(layouts, &cfg_in[idx]->channel_layouts)) < 0)
return ret; return ret;
} }
idx += ctx->nb_outputs; idx += ctx->nb_outputs;
@ -460,6 +462,6 @@ const AVFilter ff_avf_concat = {
.outputs = NULL, .outputs = NULL,
.priv_class = &concat_class, .priv_class = &concat_class,
.flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS,
FILTER_QUERY_FUNC(query_formats), FILTER_QUERY_FUNC2(query_formats),
.process_command = process_command, .process_command = process_command,
}; };