Mercurial > mplayer.hg
changeset 21632:e3e6d6fbb561
Make -embeddedfonts enabled by default with FontConfig >= 2.4.2.
| author | eugeni |
|---|---|
| date | Sun, 17 Dec 2006 12:35:12 +0000 |
| parents | 2d3fdf94a50c |
| children | 81355524d9e5 |
| files | DOCS/man/en/mplayer.1 libass/ass_mp.c |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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;