summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-04-11 11:42:19 +0200
committerClément Bœsch <ubitux@gmail.com>2013-04-11 11:51:48 +0200
commitbca4cafaf2d49c8a9c4bada17606e1f20da94d2d (patch)
tree65c17dad9bf87dac908ad3b45b06fec6b93829cb
parent9ceb7bdf6f88fb2ee7449401db2ebd4ee4c37597 (diff)
lavfi/sine: switch to an AVOptions-based system.
-rw-r--r--doc/filters.texi6
-rw-r--r--libavfilter/asrc_sine.c3
-rw-r--r--libavfilter/avfilter.c1
3 files changed, 2 insertions, 8 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 1e236143df..0334d3acbd 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1688,11 +1688,7 @@ Generate an audio signal made of a sine wave with amplitude 1/8.
The audio signal is bit-exact.
-It accepts a list of options in the form of @var{key}=@var{value} pairs
-separated by ":". If the option name is omitted, the first option is the
-frequency and the second option is the beep factor.
-
-The supported options are:
+The filter accepts the following options:
@table @option
diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c
index 148e1ee12e..9387e37688 100644
--- a/libavfilter/asrc_sine.c
+++ b/libavfilter/asrc_sine.c
@@ -210,8 +210,6 @@ static const AVFilterPad sine_outputs[] = {
{ NULL }
};
-static const char *const shorthand[] = { "frequency", "beep_factor", NULL };
-
AVFilter avfilter_asrc_sine = {
.name = "sine",
.description = NULL_IF_CONFIG_SMALL("Generate sine wave audio signal."),
@@ -222,5 +220,4 @@ AVFilter avfilter_asrc_sine = {
.inputs = NULL,
.outputs = sine_outputs,
.priv_class = &sine_class,
- .shorthand = shorthand,
};
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 39dfff68c1..feac86a462 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -752,6 +752,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "settb" ) ||
!strcmp(filter->filter->name, "showspectrum") ||
!strcmp(filter->filter->name, "silencedetect") ||
+ !strcmp(filter->filter->name, "sine" ) ||
!strcmp(filter->filter->name, "smartblur") ||
!strcmp(filter->filter->name, "split" ) ||
!strcmp(filter->filter->name, "stereo3d" ) ||