diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 01:10:40 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 11:51:47 +0200 |
| commit | 35a27402ade928d78f8b7a89c8b4e8bf8b473215 (patch) | |
| tree | 81a21fdb7c0a09937ade50ee9d2d0f102b877ffd | |
| parent | 944ad46182483ff52573ec3c827c86058b225d16 (diff) | |
lavfi/concat: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 3 | ||||
| -rw-r--r-- | libavfilter/avf_concat.c | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 7fd1481161..63ca00f435 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -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 also be the number of streams at output. -The filter accepts the following named parameters: +The filter accepts the following options: + @table @option @item n diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 2b3640b1b0..8312efa514 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -409,8 +409,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_free(cat->in); } -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_avf_concat = { .name = "concat", .description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."), @@ -421,5 +419,4 @@ AVFilter avfilter_avf_concat = { .inputs = NULL, .outputs = NULL, .priv_class = &concat_class, - .shorthand = shorthand, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index e958923ff2..659aeddcf9 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -697,6 +697,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "channelsplit") || !strcmp(filter->filter->name, "color" ) || !strcmp(filter->filter->name, "colormatrix") || + !strcmp(filter->filter->name, "concat" ) || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "curves" ) || |