diff options
| author | Michael Niedermayer | 2015-04-21 20:20:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2015-04-21 20:20:58 +0200 |
| commit | 122150168f7d2a1bdc5c208505366d1a9e9c3892 (patch) | |
| tree | 3b0284c9b73dab38877cbe16072a56cbf530de44 /doc | |
| parent | 77e794908b18c9598ed3937af00e74c01014bbd9 (diff) | |
| parent | 9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386 (diff) | |
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
drawtext: Add an alpha option
Conflicts:
doc/filters.texi
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/filters.texi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 0f2e720df0..b7a9c9be81 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -4057,6 +4057,16 @@ The font family to be used for drawing text. By default Sans. The font file to be used for drawing text. The path must be included. This parameter is mandatory if the fontconfig support is disabled. +@item draw +This option does not exist, please see the timeline system + +@item alpha +Draw the text applying alpha blending. The value can +be either a number between 0.0 and 1.0 +The expression accepts the same variables @var{x, y} do. +The default value is 1. +Please see fontcolor_expr + @item fontsize The font size to be used for drawing text. The default value of @var{fontsize} is 16. |