Author: ulion Date: Wed Dec 12 11:00:34 2007 New Revision: 25379 Log: Fix libass to support -nofontconfig. For history reason, fontconfig is auto-enabled when ass is enabled, we keep this behavior and document it clearly. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/cfg-common.h trunk/libass/ass_fontconfig.c trunk/libass/ass_mp.c trunk/libvo/font_load_ft.c trunk/mencoder.c trunk/mplayer.c Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 (original) +++ trunk/DOCS/man/en/mplayer.1 Wed Dec 12 11:00:34 2007 @@ -1982,6 +1982,10 @@ Turn on SSA/ASS subtitle rendering. With this option, libass will be used for SSA/ASS external subtitles and Matroska tracks. You may also want to use \-embeddedfonts. +.br +.I NOTE: +When fontconfig is compiled-in, \-ass turns on \-fontconfig +unless explicitly turned off with \-nofontconfig. . .TP .B \-ass\-border\-color <value> @@ -2161,6 +2165,10 @@ With fontconfig, this option determines .TP .B \-fontconfig (fontconfig only) Enables the usage of fontconfig managed fonts. +.br +.I NOTE: +\-ass automatically turns this on unless explicitly overridden +with \-nofontconfig. . .TP .B \-forcedsubsonly