summaryrefslogtreecommitdiffstats
path: root/libass/ass_utils.c
diff options
context:
space:
mode:
Diffstat (limited to 'libass/ass_utils.c')
-rw-r--r--libass/ass_utils.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libass/ass_utils.c b/libass/ass_utils.c
index e8fce67..6ca78b8 100644
--- a/libass/ass_utils.c
+++ b/libass/ass_utils.c
@@ -74,11 +74,12 @@ int mystrtod(char **p, double *res)
return 0;
}
-int strtocolor(ASS_Library *library, char **q, uint32_t *res)
+int strtocolor(ASS_Library *library, char **q, uint32_t *res, int hex)
{
uint32_t color = 0;
int result;
char *p = *q;
+ int base = hex ? 16 : 10;
if (*p == '&')
++p;
@@ -89,7 +90,7 @@ int strtocolor(ASS_Library *library, char **q, uint32_t *res)
++p;
result = mystrtou32(&p, 16, &color);
} else {
- result = mystrtou32(&p, 0, &color);
+ result = mystrtou32(&p, base, &color);
}
{