From 7d132c544b2447ef5a6b04ca6f21e245d6a48986 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 8 Dec 2009 22:00:07 +0000 Subject: [PATCH] Use an unsigned int to contain all the color values of the expressions of the type 0xRRGBBAA parsed by av_parse_color(), using a simple int was resulting in unexpected results as the most significant bit was used for the sign. Originally committed as revision 20778 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/parseutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/parseutils.c b/libavfilter/parseutils.c index 7cafa52cb0..0b67d3ddac 100644 --- a/libavfilter/parseutils.c +++ b/libavfilter/parseutils.c @@ -227,7 +227,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx) if (!strncmp(color_string, "0x", 2)) { char *tail; int len = strlen(color_string); - int rgba = strtol(color_string, &tail, 16); + unsigned int rgba = strtoul(color_string, &tail, 16); if (*tail || (len != 8 && len != 10)) { av_log(log_ctx, AV_LOG_ERROR, "Invalid 0xRRGGBB[AA] color string: '%s'\n", color_string); @@ -412,6 +412,7 @@ int main(void) "Red", "0x000000", "0x0000000", + "0xff000000", "0x3e34ff", "0x3e34ffaa", "0xffXXee",