diff options
| author | mplayer-svn <svn@mplayerhq.hu> | 2012-06-24 12:17:03 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-03 03:47:09 +0200 |
| commit | 2e125e7984496c104c790ec8bddc406ccc8bdc10 (patch) | |
| tree | 6ac2120879dcb6dfe13da7d209a4df43d7e24326 /sub | |
| parent | 1432aa41317518def4c70f79e044c379e5b87305 (diff) | |
| download | mpv-2e125e7984496c104c790ec8bddc406ccc8bdc10.tar.bz2 mpv-2e125e7984496c104c790ec8bddc406ccc8bdc10.tar.xz | |
subassconvert: order colour names alphabetically / better match W3 list
Order colour names alphabetically / better match W3 list.
Patch by Federico Kereki, fkereki gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35006 b3059339-0415-0410-9bf9-f77b7e298cf2
Add a few new CSS colors.
Patch by Federico Kereki, fkereki gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35007 b3059339-0415-0410-9bf9-f77b7e298cf2
Author: cehoyos
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/subassconvert.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/sub/subassconvert.c b/sub/subassconvert.c index e958bb9d49..c391ad7c86 100644 --- a/sub/subassconvert.c +++ b/sub/subassconvert.c @@ -95,13 +95,29 @@ static const struct { char *s; uint32_t v; } subrip_web_colors[] = { - /* 16 named HTML colors in BGR format */ - {"red", 0x0000ff}, {"blue", 0xff0000}, {"lime", 0x00ff00}, - {"aqua", 0xffff00}, {"purple", 0x800080}, {"yellow", 0x00ffff}, - {"fuchsia", 0xff00ff}, {"white", 0xffffff}, {"gray", 0x808080}, - {"maroon", 0x000080}, {"olive", 0x008080}, {"black", 0x000000}, - {"silver", 0xc0c0c0}, {"teal", 0x808000}, {"green", 0x008000}, - {"navy", 0x800000} + /* Named CSS3 colors in BGR format; a subset of those + at http://www.w3.org/TR/css3-color/#svg-color */ + {"aqua", 0xffff00}, + {"black", 0x000000}, + {"blue", 0xff0000}, + {"cyan", 0xffff00}, + {"fuchsia", 0xff00ff}, + {"gray", 0x808080}, + {"green", 0x008000}, + {"grey", 0x808080}, + {"lime", 0x00ff00}, + {"magenta", 0xff00ff}, + {"maroon", 0x000080}, + {"navy", 0x800000}, + {"olive", 0x008080}, + {"orange", 0x00a5ff}, + {"pink", 0xcbc0ff}, + {"purple", 0x800080}, + {"red", 0x0000ff}, + {"silver", 0xc0c0c0}, + {"teal", 0x808000}, + {"white", 0xffffff}, + {"yellow", 0x00ffff}, }; #define SUBRIP_MAX_STACKED_FONT_TAGS 16 |