aboutsummaryrefslogtreecommitdiffstats
path: root/doc/filters.texi
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-01-17 12:17:35 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-01-26 12:52:19 +0100
commit42c6f2a645a83c0a0adc933aff4c52861d0b32aa (patch)
tree58a843499f28b65d20771d30f4113d51885c5131 /doc/filters.texi
parent5361f4958fbfc77723b9b1a2768b00c15501ecbc (diff)
downloadffmpeg-42c6f2a645a83c0a0adc933aff4c52861d0b32aa.tar.gz
lavfi/vf_drawtext: default to expansion=normal.
Diffstat (limited to 'doc/filters.texi')
-rw-r--r--doc/filters.texi12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index b4c57e1a8e..21e2cff680 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -2017,8 +2017,8 @@ See below for the list of accepted constants and functions.
@item expansion
Select how the @var{text} is expanded. Can be either @code{none},
-@code{strftime} (default for compatibity reasons but deprecated) or
-@code{normal}. See the @ref{drawtext_expansion, Text expansion} section
+@code{strftime} (deprecated) or
+@code{normal} (default). See the @ref{drawtext_expansion, Text expansion} section
below for details.
@item fix_bounds
@@ -2192,14 +2192,14 @@ If libavfilter was built with @code{--enable-fontconfig}, then
@anchor{drawtext_expansion}
@subsection Text expansion
-If @option{expansion} is set to @code{strftime} (which is the default for
-now), the filter recognizes strftime() sequences in the provided text and
+If @option{expansion} is set to @code{strftime},
+the filter recognizes strftime() sequences in the provided text and
expands them accordingly. Check the documentation of strftime(). This
feature is deprecated.
If @option{expansion} is set to @code{none}, the text is printed verbatim.
-If @option{expansion} is set to @code{normal} (which will be the default),
+If @option{expansion} is set to @code{normal} (which is the default),
the following expansion mechanism is used.
The backslash character '\', followed by any character, always expands to
@@ -2316,7 +2316,7 @@ drawtext='fontfile=Linux Libertine O-40\:style=Semibold:text=FFmpeg'
@item
Print the date of a real-time encoding (see strftime(3)):
@example
-drawtext='fontfile=FreeSans.ttf:expansion=normal:text=%@{localtime:%a %b %d %Y@}'
+drawtext='fontfile=FreeSans.ttf:text=%@{localtime:%a %b %d %Y@}'
@end example
@end itemize