# HG changeset patch # User reimar # Date 1278855362 0 # Node ID cf048df35b009b53e1279c3eed579b001fcb64e0 # Parent e4cab1a16c0d97a4b62e5c6b6ba9df9dcf570260 Fix conversion from paletted to MPlayer's OSD format. diff -r e4cab1a16c0d -r cf048df35b00 spudec.c --- a/spudec.c Sun Jul 11 13:05:45 2010 +0000 +++ b/spudec.c Sun Jul 11 13:36:02 2010 +0000 @@ -1307,10 +1307,12 @@ for (y = 0; y < h; y++) { for (x = 0; x < w; x++) { uint32_t pixel = pal[pal_img[x]]; - *aimg++ = -(pixel >> 24); - *img++ = (((pixel & 0x000000ff) >> 0) + - ((pixel & 0x0000ff00) >> 7) + - ((pixel & 0x00ff0000) >> 16)) >> 2; + int alpha = pixel >> 24; + int gray = (((pixel & 0x000000ff) >> 0) + + ((pixel & 0x0000ff00) >> 7) + + ((pixel & 0x00ff0000) >> 16)) >> 2; + *aimg++ = -alpha; + *img++ = FFMIN(gray, alpha); } for (; x < stride; x++) *aimg++ = *img++ = 0;