Commit 35a27402 authored by Clément Bœsch's avatar Clément Bœsch

lavfi/concat: switch to an AVOptions-based system.

parent 944ad461
...@@ -6937,7 +6937,8 @@ The filter works on segments of synchronized video and audio streams. All ...@@ -6937,7 +6937,8 @@ The filter works on segments of synchronized video and audio streams. All
segments must have the same number of streams of each type, and that will segments must have the same number of streams of each type, and that will
also be the number of streams at output. also be the number of streams at output.
The filter accepts the following named parameters: The filter accepts the following options:
@table @option @table @option
@item n @item n
......
...@@ -409,8 +409,6 @@ static av_cold void uninit(AVFilterContext *ctx) ...@@ -409,8 +409,6 @@ static av_cold void uninit(AVFilterContext *ctx)
av_free(cat->in); av_free(cat->in);
} }
static const char *const shorthand[] = { NULL };
AVFilter avfilter_avf_concat = { AVFilter avfilter_avf_concat = {
.name = "concat", .name = "concat",
.description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."), .description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."),
...@@ -421,5 +419,4 @@ AVFilter avfilter_avf_concat = { ...@@ -421,5 +419,4 @@ AVFilter avfilter_avf_concat = {
.inputs = NULL, .inputs = NULL,
.outputs = NULL, .outputs = NULL,
.priv_class = &concat_class, .priv_class = &concat_class,
.shorthand = shorthand,
}; };
...@@ -697,6 +697,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque ...@@ -697,6 +697,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "channelsplit") || !strcmp(filter->filter->name, "channelsplit") ||
!strcmp(filter->filter->name, "color" ) || !strcmp(filter->filter->name, "color" ) ||
!strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "colormatrix") ||
!strcmp(filter->filter->name, "concat" ) ||
!strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "crop" ) ||
!strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "cropdetect") ||
!strcmp(filter->filter->name, "curves" ) || !strcmp(filter->filter->name, "curves" ) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment