openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-24 03:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavfi/vf_drawtext: default to expansion=normal.

Browse Source
This commit is contained in:
Nicolas George 2013-01-17 12:17:35 +01:00
parent 5361f4958f
commit 42c6f2a645
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/filters.texi
View File

@ -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

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 34
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \

2
libavfilter/vf_drawtext.c
View File

@ -188,7 +188,7 @@ static const AVOption drawtext_options[]= {
{"basetime", "set base time", OFFSET(basetime), AV_OPT_TYPE_INT64, {.i64=AV_NOPTS_VALUE}, INT64_MIN, INT64_MAX , FLAGS},
{"draw", "if false do not draw", OFFSET(draw_expr), AV_OPT_TYPE_STRING, {.str="1"}, CHAR_MIN, CHAR_MAX, FLAGS},
{"expansion","set the expansion mode", OFFSET(exp_mode), AV_OPT_TYPE_INT, {.i64=EXP_STRFTIME}, 0, 2, FLAGS, "expansion"},
{"expansion","set the expansion mode", OFFSET(exp_mode), AV_OPT_TYPE_INT, {.i64=EXP_NORMAL}, 0, 2, FLAGS, "expansion"},
{"none", "set no expansion", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_NONE}, 0, 0, FLAGS, "expansion"},
{"normal", "set normal expansion", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_NORMAL}, 0, 0, FLAGS, "expansion"},
{"strftime", "set strftime expansion (deprecated)", OFFSET(exp_mode), AV_OPT_TYPE_CONST, {.i64=EXP_STRFTIME}, 0, 0, FLAGS, "expansion"},