summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-04-11 11:39:24 +0200
committerClément Bœsch <ubitux@gmail.com>2013-04-11 11:51:48 +0200
commit9ceb7bdf6f88fb2ee7449401db2ebd4ee4c37597 (patch)
treeae83feb63163824770467bd1c1bd35cc681ca18b
parentc85f56bb4fd8051a2e365ed71bdf3e4a3f0d9faa (diff)
lavfi/deshake: switch to an AVOptions-based system.
-rw-r--r--doc/filters.texi15
-rw-r--r--libavfilter/avfilter.c1
-rw-r--r--libavfilter/vf_deshake.c7
3 files changed, 8 insertions, 15 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index d9a3599882..1e236143df 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -2529,16 +2529,14 @@ Attempt to fix small changes in horizontal and/or vertical shift. This
filter helps remove camera shake from hand-holding a camera, bumping a
tripod, moving on a vehicle, etc.
-The filter accepts parameters as a list of @var{key}=@var{value}
-pairs, separated by ":". If the key of the first options is omitted,
-the arguments are interpreted according to the syntax
-@var{x}:@var{y}:@var{w}:@var{h}:@var{rx}:@var{ry}:@var{edge}:@var{blocksize}:@var{contrast}:@var{search}:@var{filename}:@var{opencl}.
-
-A description of the accepted parameters follows.
+The filter accepts the following options:
@table @option
-@item x, y, w, h
+@item x
+@item y
+@item w
+@item h
Specify a rectangular area where to limit the search for motion
vectors.
If desired the search for motion vectors can be limited to a
@@ -2556,7 +2554,8 @@ without specifying the bounding box for the motion vector search.
Default - search the whole frame.
-@item rx, ry
+@item rx
+@item ry
Specify the maximum extent of movement in x and y directions in the
range 0-64 pixels. Default 16.
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 363614eb37..39dfff68c1 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -703,6 +703,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "curves" ) ||
!strcmp(filter->filter->name, "decimate" ) ||
!strcmp(filter->filter->name, "delogo" ) ||
+ !strcmp(filter->filter->name, "deshake" ) ||
!strcmp(filter->filter->name, "drawbox" ) ||
!strcmp(filter->filter->name, "drawtext" ) ||
!strcmp(filter->filter->name, "ebur128" ) ||
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index c8b8775371..f363c6eadf 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -560,12 +560,6 @@ static const AVFilterPad deshake_outputs[] = {
{ NULL }
};
-static const char *const shorthand[] = {
- "x", "y", "w", "h", "rx", "ry", "edge",
- "blocksize", "contrast", "search", "filename",
- NULL
-};
-
AVFilter avfilter_vf_deshake = {
.name = "deshake",
.description = NULL_IF_CONFIG_SMALL("Stabilize shaky video."),
@@ -576,5 +570,4 @@ AVFilter avfilter_vf_deshake = {
.inputs = deshake_inputs,
.outputs = deshake_outputs,
.priv_class = &deshake_class,
- .shorthand = shorthand,
};