History

lavfi/avf_concat: switch to query_func2()

Anton Khirnov committed 2 years ago

Commit d36c3681 parent a36cea41 file · +11 −9Browse files

Unified · Split

libavfilter/avf_concat.c+11−9
@@ -72,9 +72,11 @@ static const AVOption concat_options[] = { · 71 unmodified lines
7272
7373 AVFILTER_DEFINE_CLASS(concat);
7474
75−static int query_formats(AVFilterContext *ctx)
75+static int query_formats(const AVFilterContext *ctx,
76+ AVFilterFormatsConfig **cfg_in,
77+ AVFilterFormatsConfig **cfg_out)
7678 {
77− ConcatContext *cat = ctx->priv;
79+ const ConcatContext *cat = ctx->priv;
7880 unsigned type, nb_str, idx0 = 0, idx, str, seg;
7981 AVFilterFormats *formats, *rates = NULL;
8082 AVFilterChannelLayouts *layouts = NULL;
@@ -87,25 +89,25 @@ static int query_formats(AVFilterContext *ctx) · 6 unmodified lines
8789
8890 /* Set the output formats */
8991 formats = ff_all_formats(type);
90− if ((ret = ff_formats_ref(formats, &ctx->outputs[idx]->incfg.formats)) < 0)
92+ if ((ret = ff_formats_ref(formats, &cfg_out[idx]->formats)) < 0)
9193 return ret;
9294
9395 if (type == AVMEDIA_TYPE_AUDIO) {
9496 rates = ff_all_samplerates();
95− if ((ret = ff_formats_ref(rates, &ctx->outputs[idx]->incfg.samplerates)) < 0)
97+ if ((ret = ff_formats_ref(rates, &cfg_out[idx]->samplerates)) < 0)
9698 return ret;
9799 layouts = ff_all_channel_layouts();
98− if ((ret = ff_channel_layouts_ref(layouts, &ctx->outputs[idx]->incfg.channel_layouts)) < 0)
100+ if ((ret = ff_channel_layouts_ref(layouts, &cfg_out[idx]->channel_layouts)) < 0)
99101 return ret;
100102 }
101103
102104 /* Set the same formats for each corresponding input */
103105 for (seg = 0; seg < cat->nb_segments; seg++) {
104− if ((ret = ff_formats_ref(formats, &ctx->inputs[idx]->outcfg.formats)) < 0)
106+ if ((ret = ff_formats_ref(formats, &cfg_in[idx]->formats)) < 0)
105107 return ret;
106108 if (type == AVMEDIA_TYPE_AUDIO) {
107− if ((ret = ff_formats_ref(rates, &ctx->inputs[idx]->outcfg.samplerates)) < 0 ||
108− (ret = ff_channel_layouts_ref(layouts, &ctx->inputs[idx]->outcfg.channel_layouts)) < 0)
109+ if ((ret = ff_formats_ref(rates, &cfg_in[idx]->samplerates)) < 0 ||
110+ (ret = ff_channel_layouts_ref(layouts, &cfg_in[idx]->channel_layouts)) < 0)
109111 return ret;
110112 }
111113 idx += ctx->nb_outputs;
@@ -460,6 +462,6 @@ const AVFilter ff_avf_concat = { · 348 unmodified lines
460462 .outputs = NULL,
461463 .priv_class = &concat_class,
462464 .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS,
463− FILTER_QUERY_FUNC(query_formats),
465+ FILTER_QUERY_FUNC2(query_formats),
464466 .process_command = process_command,
465467 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t