clean up

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2

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();