diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-07-21 11:02:50 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-07-22 10:31:33 +0200 |
| commit | fa71471cefd5fbab4cba86507aa1f5e43f9d625d (patch) | |
| tree | 6d2e8d9d08edcd054804b316690371d1c2f20ad5 | |
| parent | d5105278857c4948554a394c822e8d68799188bc (diff) | |
| download | ffmpeg-fa71471cefd5fbab4cba86507aa1f5e43f9d625d.tar.gz | |
lavd/caca: rename "colors" option to "color"
More consistent with libcaca function names. Should not harm since the
device was added less than one day ago.
| -rw-r--r-- | doc/outdevs.texi | 4 | ||||
| -rw-r--r-- | libavdevice/caca.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/outdevs.texi b/doc/outdevs.texi index 9499c0f182..371d63a116 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -68,8 +68,8 @@ The accepted values are listed with @code{-list_dither antialiases}. Set which characters are going to be used when rendering text. The accepted values are listed with @code{-list_dither charsets}. -@item colors -Set colors to be used when rendering text. +@item color +Set color to be used when rendering text. The accepted values are listed with @code{-list_dither colors}. @item list_drivers diff --git a/libavdevice/caca.c b/libavdevice/caca.c index 538b5ff24b..0f44edd204 100644 --- a/libavdevice/caca.c +++ b/libavdevice/caca.c @@ -34,7 +34,7 @@ typedef struct CACAContext { caca_dither_t *dither; char *algorithm, *antialias; - char *charset, *colors; + char *charset, *color; char *driver; char *list_dither; @@ -195,7 +195,7 @@ static const AVOption options[] = { { "algorithm", "set dithering algorithm", OFFSET(algorithm), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, { "antialias", "set antialias method", OFFSET(antialias), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, { "charset", "set charset used to render output", OFFSET(charset), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, - { "colors", "set colors used to render output", OFFSET(colors), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, + { "color", "set color used to render output", OFFSET(color), AV_OPT_TYPE_STRING, {.str = "default" }, 0, 0, ENC }, { "list_drivers", "list available drivers", OFFSET(list_drivers), AV_OPT_TYPE_INT, {.dbl=0}, 0, 1, ENC, "list_drivers" }, { "true", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = 1}, 0, 0, ENC, "list_drivers" }, { "false", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = 0}, 0, 0, ENC, "list_drivers" }, |