diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 17:49:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 17:54:20 +0200 |
| commit | eebe0b02245c7aa9a0f14cc24c2e540ca758f5c9 (patch) | |
| tree | e96e0b7c7741bfec5efad12d966d2d1465ebb523 /doc/filters.texi | |
| parent | 1c3cdf533ba0f47e70b166b335fe3282264950d7 (diff) | |
| parent | 63e58c55c17d7f8b5eec9c082fe0f8edc305a24e (diff) | |
| download | ffmpeg-eebe0b02245c7aa9a0f14cc24c2e540ca758f5c9.tar.gz | |
Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'
* commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e':
vf_delogo: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index e5ea2459cb..2803c67fd2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2486,12 +2486,7 @@ Suppress a TV station logo by a simple interpolation of the surrounding pixels. Just set a rectangle covering the logo and watch it disappear (and sometimes something even uglier appear - your mileage may vary). -The filter accepts parameters as a string of the form -"@var{x}:@var{y}:@var{w}:@var{h}:@var{band}", or as a list of -@var{key}=@var{value} pairs, separated by ":". - -The description of the accepted parameters follows. - +This filter accepts the following options: @table @option @item x, y @@ -2520,12 +2515,6 @@ finding the right @var{x}, @var{y}, @var{w}, @var{h} parameters, and Set a rectangle covering the area with top left corner coordinates 0,0 and size 100x77, setting a band of size 10: @example -delogo=0:0:100:77:10 -@end example - -@item -As the previous example, but use named options: -@example delogo=x=0:y=0:w=100:h=77:band=10 @end example |