diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 03:42:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 05:15:26 +0200 |
| commit | 443261cbbdaac2eaba5fada318fa596bd5ab3e4a (patch) | |
| tree | da5265cf2dc4cde37afeb1b816625f728b9e525d /doc | |
| parent | c150e2cf324ce0572bb8b9b3501c45465cfbf360 (diff) | |
| parent | f1b239ec8b38474d31f3bfea1f0b1693774fa432 (diff) | |
| download | ffmpeg-443261cbbdaac2eaba5fada318fa596bd5ab3e4a.tar.gz | |
Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
drawtext: Add fontconfig support
Conflicts:
configure
doc/filters.texi
libavfilter/vf_drawtext.c
See: 40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/filters.texi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index fdbe80d344..e943923e00 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3580,6 +3580,8 @@ libfreetype library. To enable compilation of this filter, you need to configure FFmpeg with @code{--enable-libfreetype}. +To enable default font fallback and the @var{font} option you need to +configure FFmpeg with @code{--enable-libfontconfig}. @subsection Syntax @@ -3623,9 +3625,12 @@ the "Color" section in the ffmpeg-utils manual. The default value of @var{fontcolor} is "black". +@item font +The font family to be used for drawing text. By default Sans. + @item fontfile The font file to be used for drawing text. The path must be included. -This parameter is mandatory. +This parameter is mandatory if the fontconfig support is disabled. @item fontsize The font size to be used for drawing text. @@ -3786,9 +3791,6 @@ These parameters allow the @var{x} and @var{y} expressions to refer each other, so you can for example specify @code{y=x/dar}. @end table -If libavfilter was built with @code{--enable-fontconfig}, then -@option{fontfile} can be a fontconfig pattern or omitted. - @anchor{drawtext_expansion} @subsection Text expansion |