summaryrefslogtreecommitdiffstats
path: root/libass/ass_utils.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-10 23:58:24 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-10 23:58:24 +0000
commitf320e68452027ab20cac4125eec4bbf822031f85 (patch)
tree0e8ed8f9f9329bdb642876dacaa67ba24b0a6dbc /libass/ass_utils.c
parent37601a2f9e8dc1dd6de09bd21d19f3216dc9947d (diff)
downloadlibass-f320e68452027ab20cac4125eec4bbf822031f85.tar.bz2
libass-f320e68452027ab20cac4125eec4bbf822031f85.tar.xz
Support some recently discovered color formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19008 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_utils.c')
-rw-r--r--libass/ass_utils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libass/ass_utils.c b/libass/ass_utils.c
index 7b381d3..9640ead 100644
--- 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);
}
{