RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

sub: fix undefined behavior in ASS color calculation (2) 

Same problem as previous commit, fix by using the MP_ASS_RGBA() macro.
This commit is contained in:
wm4 2014-05-10 10:38:47 +02:00
parent c9e6e7cc04
commit ee529da760
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sub/sd_ass.c
View File

@ -424,10 +424,10 @@ static void mangle_colors(struct sd *sd, struct sub_bitmaps *parts)
int r = (color >> 24u) & 0xff; int r = (color >> 24u) & 0xff;
int g = (color >> 16u) & 0xff; int g = (color >> 16u) & 0xff;
int b = (color >> 8u) & 0xff; int b = (color >> 8u) & 0xff;
int a = color & 0xff; int a = 0xff - (color & 0xff);
int c[3] = {r, g, b}; int c[3] = {r, g, b};
mp_map_int_color(vs_rgb2yuv, 8, c); mp_map_int_color(vs_rgb2yuv, 8, c);
mp_map_int_color(vs2rgb, 8, c); mp_map_int_color(vs2rgb, 8, c);
sb->libass.color = (c[0] << 24u) | (c[1] << 16) | (c[2] << 8) | a; sb->libass.color = MP_ASS_RGBA(c[0], c[1], c[2], a);
} }
} }