[vlc-commits] Freetype: fix font option
Jean-Baptiste Kempf
git at videolan.org
Fri Jun 3 22:52:37 CEST 2011
vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jun 3 22:51:25 2011 +0200| [9d2acb95f17b9a6e486ec1526050c6c26c519238] | committer: Jean-Baptiste Kempf
Freetype: fix font option
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=9d2acb95f17b9a6e486ec1526050c6c26c519238
---
modules/misc/freetype.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index a4a6672..9d282f4 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -160,8 +160,13 @@ vlc_module_begin ()
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
- add_font( "freetype-font", DEFAULT_FONT_FILE, NULL, FONT_TEXT, FONT_LONGTEXT,
- false )
+ add_font( "freetype-font",
+#ifdef HAVE_STYLES
+ DEFAULT_FAMILY,
+#else
+ DEFAULT_FONT_FILE,
+#endif
+ NULL, FONT_TEXT, FONT_LONGTEXT, false )
add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
FONTSIZE_LONGTEXT, true )
More information about the vlc-commits
mailing list