diff options
author | atmosfear <atmosfear@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-17 17:43:04 +0000 |
---|---|---|
committer | atmosfear <atmosfear@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-17 17:43:04 +0000 |
commit | 39f60a9550de9523d5f1cae976b52f7da134c17d (patch) | |
tree | 645031dcff128db0c8e8007a706c0824e9e5fac3 | |
parent | 1c0e674850696880e3bbde51a301c942578b2e81 (diff) | |
download | mpv-39f60a9550de9523d5f1cae976b52f7da134c17d.tar.bz2 mpv-39f60a9550de9523d5f1cae976b52f7da134c17d.tar.xz |
Fixed OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1146 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libvo/vo_ggi.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index 0588e919ea..c9bbb8bb08 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -27,10 +27,6 @@ #define GII_BUGGY_KEYCODES #define GGI_OSD -#ifdef GGI_OSD -#warning "GGI_OSD is bugging!" -#endif - LIBVO_EXTERN (ggi) static vo_info_t vo_info = @@ -293,50 +289,49 @@ static uint32_t draw_frame(uint8_t *src[]) static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { -#warning "draw_alpha needs to be fixed!" switch(ggi_format) { case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: vo_draw_alpha_yv12(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+(virt_width*y0+x0)*ggi_bppmul, - virt_width*ggi_bppmul); + ggi_buffer->write+(virt_width*y0+x0), + virt_width); break; case IMGFMT_YUY2: case IMGFMT_YVYU: vo_draw_alpha_yuy2(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul, - 2*virt_width*ggi_bppmul); + ggi_buffer->write+2*(virt_width*y0+x0), + 2*virt_width); break; case IMGFMT_UYVY: vo_draw_alpha_yuy2(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul+1, - 2*virt_width*ggi_bppmul); + ggi_buffer->write+2*(virt_width*y0+x0)+1, + 2*virt_width); break; case IMGFMT_RGB15: case IMGFMT_BGR15: vo_draw_alpha_rgb15(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul, - 2*virt_width*ggi_bppmul); + ggi_buffer->write+2*(virt_width*y0+x0), + 2*virt_width); break; case IMGFMT_RGB16: case IMGFMT_BGR16: vo_draw_alpha_rgb16(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+2*(virt_width*y0+x0)*ggi_bppmul, - 2*virt_width*ggi_bppmul); + ggi_buffer->write+2*(virt_width*y0+x0), + 2*virt_width); break; case IMGFMT_RGB24: case IMGFMT_BGR24: vo_draw_alpha_rgb24(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+3*(virt_width*y0+x0)*ggi_bppmul, - 3*virt_width*ggi_bppmul); + ggi_buffer->write+3*(virt_width*y0+x0), + 3*virt_width); break; case IMGFMT_RGB32: case IMGFMT_BGR32: vo_draw_alpha_rgb32(w, h, src, srca, stride, - ((uint8_t *) ggi_buffer->write)+4*(virt_width*y0+x0)*ggi_bppmul, - 4*virt_width*ggi_bppmul); + ggi_buffer->write+4*(virt_width*y0+x0), + 4*virt_width); break; } } |