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
72 72
73AVFILTER_DEFINE_CLASS(concat);73AVFILTER_DEFINE_CLASS(concat);
74 74
75static int query_formats(AVFilterContext *ctx)75static int query_formats(const AVFilterContext *ctx,
76 AVFilterFormatsConfig **cfg_in,
77 AVFilterFormatsConfig **cfg_out)
76{78{
77 ConcatContext *cat = ctx->priv;79 const ConcatContext *cat = ctx->priv;
78 unsigned type, nb_str, idx0 = 0, idx, str, seg;80 unsigned type, nb_str, idx0 = 0, idx, str, seg;
79 AVFilterFormats *formats, *rates = NULL;81 AVFilterFormats *formats, *rates = NULL;
80 AVFilterChannelLayouts *layouts = NULL;82 AVFilterChannelLayouts *layouts = NULL;
@@ -87,25 +89,25 @@ static int query_formats(AVFilterContext *ctx) · 6 unmodified lines
87 89
88 /* Set the output formats */90 /* Set the output formats */
89 formats = ff_all_formats(type);91 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)
91 return ret;93 return ret;
92 94
93 if (type == AVMEDIA_TYPE_AUDIO) {95 if (type == AVMEDIA_TYPE_AUDIO) {
94 rates = ff_all_samplerates();96 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)
96 return ret;98 return ret;
97 layouts = ff_all_channel_layouts();99 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)
99 return ret;101 return ret;
100 }102 }
101 103
102 /* Set the same formats for each corresponding input */104 /* Set the same formats for each corresponding input */
103 for (seg = 0; seg < cat->nb_segments; seg++) {105 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)
105 return ret;107 return ret;
106 if (type == AVMEDIA_TYPE_AUDIO) {108 if (type == AVMEDIA_TYPE_AUDIO) {
107 if ((ret = ff_formats_ref(rates, &ctx->inputs[idx]->outcfg.samplerates)) < 0 ||109 if ((ret = ff_formats_ref(rates, &cfg_in[idx]->samplerates)) < 0 ||
108 (ret = ff_channel_layouts_ref(layouts, &ctx->inputs[idx]->outcfg.channel_layouts)) < 0)110 (ret = ff_channel_layouts_ref(layouts, &cfg_in[idx]->channel_layouts)) < 0)
109 return ret;111 return ret;
110 }112 }
111 idx += ctx->nb_outputs;113 idx += ctx->nb_outputs;
@@ -460,6 +462,6 @@ const AVFilter ff_avf_concat = { · 348 unmodified lines
460 .outputs = NULL,462 .outputs = NULL,
461 .priv_class = &concat_class,463 .priv_class = &concat_class,
462 .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS,464 .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS,
463 FILTER_QUERY_FUNC(query_formats),465 FILTER_QUERY_FUNC2(query_formats),
464 .process_command = process_command,466 .process_command = process_command,
465};467};

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