diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 22:15:10 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-10 23:16:02 +0200 |
| commit | 8388e1e2b343e25b3a7de31079557285b7353ebd (patch) | |
| tree | 2503a3e95d8c5f21eb87ab7a979c50039078d48a | |
| parent | 5afd58fbb4571d8b9c81c7573c2a43d5ad15672a (diff) | |
| download | ffmpeg-8388e1e2b343e25b3a7de31079557285b7353ebd.tar.gz | |
lavfi/perms: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 6 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/f_perms.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 1155463712..796cdce929 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6344,11 +6344,7 @@ Set read/write permissions for the output frames. These filters are mainly aimed at developers to test direct path in the following filter in the filtergraph. -The filters accept parameters as a list of @var{key}=@var{value} pairs, -separated by ":". If the key of the first options is omitted, the argument is -assumed to be the @var{mode}. - -A description of the accepted parameters follows. +The filters accept the following options: @table @option @item mode diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6ec944b467..a7d05e47e0 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -681,6 +681,8 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "pad" ) || !strcmp(filter->filter->name, "format") || !strcmp(filter->filter->name, "noformat") || + !strcmp(filter->filter->name, "perms") || + !strcmp(filter->filter->name, "aperms") || !strcmp(filter->filter->name, "resample") || !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c index 9853eab4a5..33674170b6 100644 --- a/libavfilter/f_perms.c +++ b/libavfilter/f_perms.c @@ -111,8 +111,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ret; } -static const char *const shorthand[] = { "mode", NULL }; - #if CONFIG_APERMS_FILTER #define aperms_options options @@ -143,7 +141,6 @@ AVFilter avfilter_af_aperms = { .inputs = aperms_inputs, .outputs = aperms_outputs, .priv_class = &aperms_class, - .shorthand = shorthand, }; #endif /* CONFIG_APERMS_FILTER */ @@ -177,6 +174,5 @@ AVFilter avfilter_vf_perms = { .inputs = perms_inputs, .outputs = perms_outputs, .priv_class = &perms_class, - .shorthand = shorthand, }; #endif /* CONFIG_PERMS_FILTER */ |