virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Use an unsigned int to contain all the color values of the expressions

Browse Source 
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
This commit is contained in:
Stefano Sabatini 2009-12-08 22:00:07 +00:00
parent 758c7455f1
commit 7d132c544b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/parseutils.c
View File

@ -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)) { if (!strncmp(color_string, "0x", 2)) {
char *tail; char *tail;
int len = strlen(color_string); 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)) { if (*tail || (len != 8 && len != 10)) {
av_log(log_ctx, AV_LOG_ERROR, "Invalid 0xRRGGBB[AA] color string: '%s'\n", color_string); av_log(log_ctx, AV_LOG_ERROR, "Invalid 0xRRGGBB[AA] color string: '%s'\n", color_string);
@ -412,6 +412,7 @@ int main(void)
"Red", "Red",
"0x000000", "0x000000",
"0x0000000", "0x0000000",
"0xff000000",
"0x3e34ff", "0x3e34ff",
"0x3e34ffaa", "0x3e34ffaa",
"0xffXXee", "0xffXXee",