diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-01-17 12:17:35 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-01-26 12:52:19 +0100 |
| commit | 42c6f2a645a83c0a0adc933aff4c52861d0b32aa (patch) | |
| tree | 58a843499f28b65d20771d30f4113d51885c5131 | |
| parent | 5361f4958fbfc77723b9b1a2768b00c15501ecbc (diff) | |
| download | ffmpeg-42c6f2a645a83c0a0adc933aff4c52861d0b32aa.tar.gz | |
lavfi/vf_drawtext: default to expansion=normal.
| -rw-r--r-- | doc/filters.texi | 12 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_drawtext.c | 2 |
3 files changed, 8 insertions, 8 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 diff --git a/libavfilter/version.h b/libavfilter/version.h index 94f10992ca..d73fd3bba6 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -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, \ diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 53a60b1679..2358e35c26 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -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"}, |