# HG changeset patch
# User eugeni
# Date 1166358912 0
# Node ID e3e6d6fbb56129aca21b3703090ebec313b7ba1f
# Parent  2d3fdf94a50c9139aa41b14b8fd111bf5a167693
Make -embeddedfonts enabled by default with FontConfig >= 2.4.2.

diff -r 2d3fdf94a50c -r e3e6d6fbb561 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Sun Dec 17 12:33:09 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Sun Dec 17 12:35:12 2006 +0000
@@ -1913,10 +1913,14 @@
 Also see the \-dump*sub and \-vobsubout* options.
 .
 .TP
-.B \-embeddedfonts (FreeType only)
-Enables extraction of Matroska embedded fonts.
+.B \-(no)embeddedfonts (FreeType only)
+Enables extraction of Matroska embedded fonts (default: disabled).
 These fonts can be used for SSA/ASS subtitle
-rendering (\-ass option).
+rendering (\-ass option). Font files are created in ~/.mplayer/fonts directory.
+.br
+.I NOTE:
+With FontConfig 2.4.2 or newer, embedded fonts are opened directly from memory,
+and this option is enabled by default.
 .
 .TP
 .B \-ffactor <number>
diff -r 2d3fdf94a50c -r e3e6d6fbb561 libass/ass_mp.c
--- a/libass/ass_mp.c	Sun Dec 17 12:33:09 2006 +0000
+++ b/libass/ass_mp.c	Sun Dec 17 12:35:12 2006 +0000
@@ -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;