diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libvo/font_load.h | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libvo/font_load.h')
| -rw-r--r-- | libvo/font_load.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libvo/font_load.h b/libvo/font_load.h index 38c1e321ec..6bb4a175e3 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -63,8 +63,6 @@ typedef struct font_desc { extern font_desc_t* vo_font; -#ifdef CONFIG_FREETYPE - extern char *subtitle_font_encoding; extern float text_font_scale_factor; extern float osd_font_scale_factor; @@ -80,7 +78,7 @@ extern int force_load_font; int init_freetype(void); int done_freetype(void); -font_desc_t* read_font_desc_ft(const char* fname,int movie_width, int movie_height, float font_scale_factor); +font_desc_t* read_font_desc_ft(const char* fname,int face_index,int movie_width, int movie_height, float font_scale_factor); void free_font_desc(font_desc_t *desc); void render_one_glyph(font_desc_t *desc, int c); @@ -91,13 +89,6 @@ void load_font_ft(int width, int height, font_desc_t **desc, const char *name, f void blur(unsigned char *buffer, unsigned short *tmp2, int width, int height, int stride, int *m2, int r, int mwidth); -#else - -static void render_one_glyph(font_desc_t *desc, int c) {} -static int kerning(font_desc_t *desc, int prevc, int c) { return 0; } - -#endif - raw_file* load_raw(char *name,int verbose); font_desc_t* read_font_desc(const char* fname,float factor,int verbose); |