diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-24 00:32:13 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-24 00:32:13 +0000 |
| commit | 2eba558fcdd534b37378faf5c4fc0c30cae1376b (patch) | |
| tree | 91c42d27b67aeeefdc4f02754d3ecab7afffdfb8 | |
| parent | 42d31020c90e64ff40e14c81be71686af46ce7f1 (diff) | |
| download | mpv-2eba558fcdd534b37378faf5c4fc0c30cae1376b.tar.bz2 mpv-2eba558fcdd534b37378faf5c4fc0c30cae1376b.tar.xz | |
moved font_laod.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5295 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/font_load.h | 2 | ||||
| -rw-r--r-- | libvo/sub.c | 1 | ||||
| -rw-r--r-- | libvo/sub.h | 2 | ||||
| -rw-r--r-- | libvo/video_out.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/libvo/font_load.h b/libvo/font_load.h index ea98b46ca9..d43325521b 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -20,5 +20,7 @@ typedef struct { short width[65536]; } font_desc_t; +extern font_desc_t* vo_font; + raw_file* load_raw(char *name,int verbose); font_desc_t* read_font_desc(char* fname,float factor,int verbose); diff --git a/libvo/sub.c b/libvo/sub.c index 9532775602..20834a5cb2 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -1,6 +1,7 @@ #include "config.h" #include "video_out.h" +#include "font_load.h" #include "sub.h" #include <stdlib.h> diff --git a/libvo/sub.h b/libvo/sub.h index 7388350c70..574da401f4 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -12,8 +12,6 @@ static inline void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,in #include "../subreader.h" -extern font_desc_t* vo_font; - extern unsigned char* vo_osd_text; extern int vo_osd_progbar_type; diff --git a/libvo/video_out.h b/libvo/video_out.h index d8596894a4..654ff4951e 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -12,7 +12,7 @@ #include <inttypes.h> #include <stdarg.h> -#include "font_load.h" +//#include "font_load.h" #include "img_format.h" #include "../vidix/vidix.h" |