[MPlayer-cvslog] r35006 - trunk/sub/subassconvert.c

[cehoyos]

Author: cehoyos
Date: Sun Jun 24 14:17:03 2012
New Revision: 35006

Log:
Order colour names alphabetically / better match W3 list.

Patch by Federico Kereki, fkereki gmail

Modified:
   trunk/sub/subassconvert.c

Modified: trunk/sub/subassconvert.c
==============================================================================
--- trunk/sub/subassconvert.c	Fri Jun 22 22:07:15 2012	(r35005)
+++ trunk/sub/subassconvert.c	Sun Jun 24 14:17:03 2012	(r35006)
@@ -93,13 +93,24 @@ static const struct {
     const 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},
+    {"fuchsia", 0xff00ff},
+    {"gray",    0x808080},
+    {"green",   0x008000},
+    {"lime",    0x00ff00},
+    {"maroon",  0x000080},
+    {"navy",    0x800000},
+    {"olive",   0x008080},
+    {"purple",  0x800080},
+    {"red",     0x0000ff},
+    {"silver",  0xc0c0c0},
+    {"teal",    0x808000},
+    {"white",   0xffffff},
+    {"yellow",  0x00ffff},
 };
 
 #define SUBRIP_MAX_STACKED_FONT_TAGS    16