diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 11:45:25 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 11:51:48 +0200 |
| commit | cb2327e88d662e3c1da812bc18e9c504d068dd74 (patch) | |
| tree | 4afd44a81fe817bbb07e668d063cef1461bf5088 | |
| parent | bca4cafaf2d49c8a9c4bada17606e1f20da94d2d (diff) | |
| download | ffmpeg-cb2327e88d662e3c1da812bc18e9c504d068dd74.tar.gz | |
lavfi/aselect: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/f_select.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 0334d3acbd..2a5b9af4a2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6376,7 +6376,7 @@ This filter accepts the following options: @table @option -@item expr +@item expr, e An expression, which is evaluated for each input frame. If the expression is evaluated to a non-zero value, the frame is selected and passed to the output, otherwise it is discarded. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index feac86a462..c59d155565 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -766,6 +766,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "unsharp" ) || // !strcmp(filter->filter->name, "scale" ) || !strcmp(filter->filter->name, "select") || + !strcmp(filter->filter->name, "aselect" ) || !strcmp(filter->filter->name, "volume" ) || !strcmp(filter->filter->name, "yadif" ) || 0 diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index e2c4ef719a..b34196dee3 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -388,8 +388,6 @@ static int query_formats(AVFilterContext *ctx) return 0; } -static const char *const shorthand[] = { "expr", NULL }; - #if CONFIG_ASELECT_FILTER #define OFFSET(x) offsetof(SelectContext, x) @@ -445,7 +443,6 @@ AVFilter avfilter_af_aselect = { .inputs = avfilter_af_aselect_inputs, .outputs = avfilter_af_aselect_outputs, .priv_class = &aselect_class, - .shorthand = shorthand, }; #endif /* CONFIG_ASELECT_FILTER */ |