diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:25:04 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 16:25:04 +0300 |
commit | 8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9 (patch) | |
tree | a7be3f915e6d2d8a3d06544fbbdd692dcf19956d /libvo | |
parent | 78f51a921f0141362fc95f215ffade5e87d87578 (diff) | |
parent | c36de0867fc576ad5fd58fc28bd5fe3322579f36 (diff) | |
download | mpv-8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9.tar.bz2 mpv-8ce2c41ca57b405dc5bbe9b3d552e7755abbdeb9.tar.xz |
Merge svn changes up to r31226
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/osd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/osd.c b/libvo/osd.c index 54854c785f..992ffc01f3 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -284,6 +284,7 @@ void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char *srca, i } #ifdef FAST_OSD_TABLE +static unsigned short fast_osd_12bpp_table[256]; static unsigned short fast_osd_15bpp_table[256]; static unsigned short fast_osd_16bpp_table[256]; #endif @@ -292,6 +293,7 @@ void vo_draw_alpha_init(void){ #ifdef FAST_OSD_TABLE int i; for(i=0;i<256;i++){ + fast_osd_12bpp_table[i]=((i>>4)<< 8)|((i>>4)<<4)|(i>>4); fast_osd_15bpp_table[i]=((i>>3)<<10)|((i>>3)<<5)|(i>>3); fast_osd_16bpp_table[i]=((i>>3)<<11)|((i>>2)<<5)|(i>>3); } |