diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:11:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:11:15 +0200 |
| commit | 0726d516dcd1e12d493b402bbe256d8c4b50acc6 (patch) | |
| tree | 7d4e275fa24f50688aadf3a91771cc2c0f5b837e /doc/filters.texi | |
| parent | 215ca864759a54f45265a51ac57dbfd75cb23da2 (diff) | |
| parent | 335c31293baec6e6cf5907bd29840af3de8ff735 (diff) | |
| download | ffmpeg-0726d516dcd1e12d493b402bbe256d8c4b50acc6.tar.gz | |
Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
* commit '335c31293baec6e6cf5907bd29840af3de8ff735':
vf_drawbox: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_drawbox.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/filters.texi')
| -rw-r--r-- | doc/filters.texi | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 158b74b3ae..d2a3479ac6 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2612,12 +2612,7 @@ FFmpeg was configured with @code{--enable-opencl}. Default value is 0. Draw a colored box on the input image. -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 -@option{x}:@option{y}:@option{width}:@option{height}:@option{color}:@option{thickness}. - -A description of the accepted options follows. +This filter accepts the following options: @table @option @item x, y |