Unified · Split
| @@ -2529,16 +2529,14 @@ Attempt to fix small changes in horizontal and/or vertical shift. This · 2528 unmodified lines | |||
| 2529 | filter helps remove camera shake from hand-holding a camera, bumping a | 2529 | filter helps remove camera shake from hand-holding a camera, bumping a |
| 2530 | tripod, moving on a vehicle, etc. | 2530 | tripod, moving on a vehicle, etc. |
| 2531 | 2531 | ||
| 2532 | The filter accepts parameters as a list of @var{key}=@var{value} | 2532 | The filter accepts the following options: |
| 2533 | pairs, separated by ":". If the key of the first options is omitted, | ||
| 2534 | the arguments are interpreted according to the syntax | ||
| 2535 | @var{x}:@var{y}:@var{w}:@var{h}:@var{rx}:@var{ry}:@var{edge}:@var{blocksize}:@var{contrast}:@var{search}:@var{filename}:@var{opencl}. | ||
| 2536 | |||
| 2537 | A description of the accepted parameters follows. | ||
| 2538 | 2533 | ||
| 2539 | @table @option | 2534 | @table @option |
| 2540 | 2535 | ||
| 2541 | @item x, y, w, h | 2536 | @item x |
| 2537 | @item y | ||
| 2538 | @item w | ||
| 2539 | @item h | ||
| 2542 | Specify a rectangular area where to limit the search for motion | 2540 | Specify a rectangular area where to limit the search for motion |
| 2543 | vectors. | 2541 | vectors. |
| 2544 | If desired the search for motion vectors can be limited to a | 2542 | 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. · 11 unmodified lines | |||
| 2556 | 2554 | ||
| 2557 | Default - search the whole frame. | 2555 | Default - search the whole frame. |
| 2558 | 2556 | ||
| 2559 | @item rx, ry | 2557 | @item rx |
| 2558 | @item ry | ||
| 2560 | Specify the maximum extent of movement in x and y directions in the | 2559 | Specify the maximum extent of movement in x and y directions in the |
| 2561 | range 0-64 pixels. Default 16. | 2560 | range 0-64 pixels. Default 16. |
| 2562 | 2561 | ||
| @@ -703,6 +703,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 702 unmodified lines | |||
| 703 | !strcmp(filter->filter->name, "curves" ) || | 703 | !strcmp(filter->filter->name, "curves" ) || |
| 704 | !strcmp(filter->filter->name, "decimate" ) || | 704 | !strcmp(filter->filter->name, "decimate" ) || |
| 705 | !strcmp(filter->filter->name, "delogo" ) || | 705 | !strcmp(filter->filter->name, "delogo" ) || |
| 706 | !strcmp(filter->filter->name, "deshake" ) || | ||
| 706 | !strcmp(filter->filter->name, "drawbox" ) || | 707 | !strcmp(filter->filter->name, "drawbox" ) || |
| 707 | !strcmp(filter->filter->name, "drawtext" ) || | 708 | !strcmp(filter->filter->name, "drawtext" ) || |
| 708 | !strcmp(filter->filter->name, "ebur128" ) || | 709 | !strcmp(filter->filter->name, "ebur128" ) || |
| @@ -560,12 +560,6 @@ static const AVFilterPad deshake_outputs[] = { · 559 unmodified lines | |||
| 560 | { NULL } | 560 | { NULL } |
| 561 | }; | 561 | }; |
| 562 | 562 | ||
| 563 | static const char *const shorthand[] = { | ||
| 564 | "x", "y", "w", "h", "rx", "ry", "edge", | ||
| 565 | "blocksize", "contrast", "search", "filename", | ||
| 566 | NULL | ||
| 567 | }; | ||
| 568 | |||
| 569 | AVFilter avfilter_vf_deshake = { | 563 | AVFilter avfilter_vf_deshake = { |
| 570 | .name = "deshake", | 564 | .name = "deshake", |
| 571 | .description = NULL_IF_CONFIG_SMALL("Stabilize shaky video."), | 565 | .description = NULL_IF_CONFIG_SMALL("Stabilize shaky video."), |
| @@ -576,5 +570,4 @@ AVFilter avfilter_vf_deshake = { · 4 unmodified lines | |||
| 576 | .inputs = deshake_inputs, | 570 | .inputs = deshake_inputs, |
| 577 | .outputs = deshake_outputs, | 571 | .outputs = deshake_outputs, |
| 578 | .priv_class = &deshake_class, | 572 | .priv_class = &deshake_class, |
| 579 | .shorthand = shorthand, | ||
| 580 | }; | 573 | }; |