add Jindrich Makovicka <makovick@KMLinux.fjfi.cvut.cz> freetype patch

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

1 files changed, 7 insertions, 5 deletions

diff --git a/libvo/font_load.h b/libvo/font_load.h
index 594aaaf10b..3c1876ada7 100644
--- a/libvo/font_load.h
+++ b/libvo/font_load.h
@@ -16,6 +16,9 @@ typedef struct {
 } raw_file;
 
 typedef struct {
+#ifdef HAVE_FREETYPE
+    int dynamic;
+#endif
     char *name;
     char *fpath;
     int spacewidth;
@@ -47,7 +50,6 @@ typedef struct {
 	unsigned volume;
 
 	unsigned *g;
-	unsigned *gt;
 	unsigned *gt2;
 	unsigned *om;
 	unsigned char *omt;
@@ -76,7 +78,7 @@ extern int force_load_font;
 int init_freetype();
 int done_freetype();
 
-font_desc_t* read_font_desc(char* fname,float factor,int movie_width, int movie_height);
+font_desc_t* read_font_desc(char* fname,int movie_width, int movie_height);
 void free_font_desc(font_desc_t *desc);
 
 void render_one_glyph(font_desc_t *desc, int c);
@@ -89,16 +91,16 @@ void load_font(int width, int height);
 raw_file* load_raw(char *name,int verbose);
 font_desc_t* read_font_desc(char* fname,float factor,int verbose);
 
-static void inline render_one_glyph(font_desc_t *desc, int c) 
+extern void inline render_one_glyph(font_desc_t *desc, int c) 
 {
 }
 
-static int inline kerning(font_desc_t *desc, int prevc, int c) 
+extern int inline kerning(font_desc_t *desc, int prevc, int c) 
 {
     return 0;
 }
 
-static void inline load_font(int width, int height)
+extern void inline load_font(int width, int height)
 {
 }