diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-05-02 00:56:30 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-05-03 10:29:08 +0200 |
| commit | 126ba1626e84bdb52b0c272b9c7219c62117721c (patch) | |
| tree | a58101fc012f6883a47aa4b39d0cd6121e1081f0 | |
| parent | 4f19e50c2352a199cfe79820b1b4942c1d2d9d61 (diff) | |
| download | ffmpeg-126ba1626e84bdb52b0c272b9c7219c62117721c.tar.gz | |
lavfi/drawtext: give a new alias "timecode_rate" to the the r/rate option
The option is related to the timecode, the new name clearly specifies the
context. Also it allows to list the option close to the other timecode
options.
| -rw-r--r-- | doc/filters.texi | 8 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_drawtext.c | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 9182704273..79e3ae703f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1329,9 +1329,6 @@ Default value is "render". For more information consult the documentation for the FT_LOAD_* libfreetype flags. -@item rate, r -Set the timecode frame rate (timecode only). - @item shadowcolor The color to be used for drawing a shadow behind the drawn text. It can be a color name (e.g. "yellow") or a string in the 0xRRGGBB[AA] @@ -1349,9 +1346,12 @@ Default value is 4. @item timecode Set the initial timecode representation in "hh:mm:ss[:;.]ff" -format. It can be used with or without text parameter. @var{rate} +format. It can be used with or without text parameter. @var{timecode_rate} option must be specified. +@item timecode_rate, rate, r +Set the timecode frame rate (timecode only). + @item text The text string to be drawn. The text must be a sequence of UTF-8 encoded characters. diff --git a/libavfilter/version.h b/libavfilter/version.h index 134cba06b8..c9da0c57f7 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 72 -#define LIBAVFILTER_VERSION_MICRO 103 +#define LIBAVFILTER_VERSION_MICRO 104 #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 74a19c8ca2..59f6f00191 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -178,6 +178,7 @@ static const AVOption drawtext_options[]= { {"draw", "if false do not draw", OFFSET(draw_expr), AV_OPT_TYPE_STRING, {.str="1"}, CHAR_MIN, CHAR_MAX }, {"timecode", "set initial timecode", OFFSET(tc_opt_string), AV_OPT_TYPE_STRING, {.str=NULL}, CHAR_MIN, CHAR_MAX }, {"tc24hmax", "set 24 hours max (timecode only)", OFFSET(tc24hmax), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1 }, +{"timecode_rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX }, {"r", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX }, {"rate", "set rate (timecode only)", OFFSET(tc_rate), AV_OPT_TYPE_RATIONAL, {.dbl=0}, 0, INT_MAX }, {"fix_bounds", "if true, check and fix text coords to avoid clipping", |