[MPlayer-cvslog] r21648 - in trunk: DOCS/man/en/mplayer.1 libass/ass_mp.c

[eugeni]

Author: eugeni
Date: Sun Dec 17 13:35:12 2006
New Revision: 21648

Modified:
   trunk/libass/ass_mp.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Log:
Make -embeddedfonts enabled by default with FontConfig >= 2.4.2.


Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	(original)
+++ trunk/libass/ass_mp.c	Sun Dec 17 13:35:12 2006
@@ -29,6 +29,10 @@
 #include "ass_mp.h"
 #include "ass_library.h"
 
+#ifdef HAVE_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#endif
+
 // libass-related command line options
 ass_library_t* ass_library;
 int ass_enabled = 0;
@@ -36,7 +40,11 @@
 float ass_line_spacing = 0.;
 int ass_top_margin = 0;
 int ass_bottom_margin = 0;
+#if defined(FC_VERSION) && (FC_VERSION >= 20402)
+int extract_embedded_fonts = 1;
+#else
 int extract_embedded_fonts = 0;
+#endif
 char **ass_force_style_list = NULL;
 int ass_use_margins = 0;
 char* ass_color = NULL;