[FFmpeg-cvslog] lavd/caca: rename "colors" option to "color"

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Sat Jul 21 11:02:50 2012 +0200| [fa71471cefd5fbab4cba86507aa1f5e43f9d625d] | committer: Stefano Sabatini

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa71471cefd5fbab4cba86507aa1f5e43f9d625d
---

 doc/outdevs.texi   |    4 ++--
 libavdevice/caca.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/outdevs.texi b/doc/outdevs.texi
index 9499c0f..371d63a 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}.
 
- at item colors
-Set colors to be used when rendering text.
+ at 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 538b5ff..0f44edd 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" },