Support some recently discovered color formats.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19008 b3059339-0415-0410-9bf9-f77b7e298cf2

diff --git a/libass/ass_utils.c b/libass/ass_utils.c
index 7b381d3d38a753e61d57aa8e1ac0d744e551443d..9640ead0140f081539a527f97c777f1bbf49ef68 100644 (file)
--- a/libass/ass_utils.c
+++ b/libass/ass_utils.c
@@ -39,13 +39,13 @@ int strtocolor(char** q, uint32_t* res)
        char* p = *q;
        
        if (*p == '&') ++p; 
-       else mp_msg(MSGT_GLOBAL, MSGL_V, "bad color: \"%s\"\n", p);
+       else mp_msg(MSGT_GLOBAL, MSGL_DBG2, "suspicious color format: \"%s\"\n", p);
        
-       if (*p == 'H') { 
+       if (*p == 'H' || *p == 'h') { 
                ++p;
                result = mystrtou32(&p, 16, &color);
        } else {
-               result = mystrtou32(&p, 10, &color);
+               result = mystrtou32(&p, 0, &color);
        }
        
        {