diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-24 11:42:04 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-24 11:42:04 +0000 |
commit | 4ff11b99495e63895791171a82694ed51d62448c (patch) | |
tree | b8c4fa4d36c147dacc0b7e09b132cdd6e3e8e569 /libvo/vo_x11.c | |
parent | 9126c8286e950b45eaccccd7937184644ca2496f (diff) | |
download | mpv-4ff11b99495e63895791171a82694ed51d62448c.tar.bz2 mpv-4ff11b99495e63895791171a82694ed51d62448c.tar.xz |
clean up
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r-- | libvo/vo_x11.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index ec23744a69..b3a21a0f00 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -37,6 +37,7 @@ LIBVO_EXTERN( x11 ) #include "x11_common.h" #include "fastmemcpy.h" +#include "sub.h" static vo_info_t vo_info = { @@ -387,18 +388,7 @@ static void Display_Image( XImage *myximage,uint8_t *ImageData ) #endif } -extern void vo_draw_alpha_rgb24(int w,int h, unsigned char* src, - unsigned char *srca, int srcstride, unsigned char* dstbase, - int dststride); -extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, - unsigned char *srca, int srcstride, unsigned char* dstbase, - int dststride); -extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, - unsigned char *srca, int srcstride, unsigned char* dstbase, - int dststride); -extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, - unsigned char *srca, int srcstride, unsigned char* dstbase, - int dststride); +#include "osd.h" static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ switch(bpp){ @@ -418,10 +408,6 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned } } -extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, - int w,int h, unsigned char* src, unsigned char *srca, - int stride)); - static void flip_page( void ){ vo_draw_text(image_width,image_height,draw_alpha); check_events(); |