diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-22 19:21:16 +0000 |
commit | 544233bded74186eca2498e202ed82003c5e04be (patch) | |
tree | f6360316ae6a9a2b01bac7ff6494ee94bd655cf2 /libvo/font_load_ft.c | |
parent | 6982f81d903afe3838cd743d5f0b50e10be2f2cc (diff) | |
download | mpv-544233bded74186eca2498e202ed82003c5e04be.tar.bz2 mpv-544233bded74186eca2498e202ed82003c5e04be.tar.xz |
Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/font_load_ft.c')
-rw-r--r-- | libvo/font_load_ft.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 8a5c3964da..d068e046fe 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -1150,7 +1150,6 @@ void load_font_ft(int width, int height) if (vo_font) free_font_desc(vo_font); -#ifdef USE_OSD #ifdef HAVE_FONTCONFIG if (font_fontconfig) { @@ -1176,5 +1175,4 @@ void load_font_ft(int width, int height) else #endif vo_font=read_font_desc_ft(font_name, width, height); -#endif } |