Browse Source

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.
tags/n0.11
Stefano Sabatini 13 years ago
parent
commit
126ba1626e
3 changed files with 6 additions and 5 deletions
  1. +4
    -4
      doc/filters.texi
  2. +1
    -1
      libavfilter/version.h
  3. +1
    -0
      libavfilter/vf_drawtext.c

+ 4
- 4
doc/filters.texi View File

@@ -1329,9 +1329,6 @@ Default value is "render".
For more information consult the documentation for the FT_LOAD_* For more information consult the documentation for the FT_LOAD_*
libfreetype flags. libfreetype flags.


@item rate, r
Set the timecode frame rate (timecode only).

@item shadowcolor @item shadowcolor
The color to be used for drawing a shadow behind the drawn text. It 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] 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 @item timecode
Set the initial timecode representation in "hh:mm:ss[:;.]ff" 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. option must be specified.


@item timecode_rate, rate, r
Set the timecode frame rate (timecode only).

@item text @item text
The text string to be drawn. The text must be a sequence of UTF-8 The text string to be drawn. The text must be a sequence of UTF-8
encoded characters. encoded characters.


+ 1
- 1
libavfilter/version.h View File

@@ -30,7 +30,7 @@


#define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 72 #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, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \


+ 1
- 0
libavfilter/vf_drawtext.c View File

@@ -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 }, {"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 }, {"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 }, {"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 }, {"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 }, {"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", {"fix_bounds", "if true, check and fix text coords to avoid clipping",


Loading…
Cancel
Save