From 896c9c13847d2bda507646fdc87c412ef0e4a4de Mon Sep 17 00:00:00 2001
From: eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 17 Dec 2006 12:35:12 +0000
Subject: [PATCH] Make -embeddedfonts enabled by default with FontConfig >=
 2.4.2.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21648 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/man/en/mplayer.1 | 10 +++++++---
 libass/ass_mp.c       |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 56e0a4b829..dfa5f2400a 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1913,10 +1913,14 @@ Dumps the subtitle substream from VOB streams.
 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 --git a/libass/ass_mp.c b/libass/ass_mp.c
index a4d195ffad..5f0234a7e3 100644
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -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_font_scale = 1.;
 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;