[MPlayer-dev-eng] [PATCH] Fix bug libass always use fontconfig does not care -nofontconfig

[Ulion]

2007/12/12, Diego Biurrun <diego at biurrun.de>:
> On Wed, Dec 12, 2007 at 08:57:49AM +0800, Ulion wrote:
> >
> > Here's updated patch with man page update.
> >
> > --- DOCS/man/en/mplayer.1     (revision 25370)
> > +++ DOCS/man/en/mplayer.1     (working copy)
> > @@ -1982,6 +1982,11 @@
> >  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, if \-ass turns on,
> > +\-fontconfig will be auto-enabled unless explicitly
> > +turn off \-fontconfig in config file or command line.
>
> When fontconfig is compiled-in, \-ass turns on \-fontconfig
> unless explicitly turned off with \-nofontconfig.
>
> > @@ -2161,6 +2166,11 @@
> >  .TP
> >  .B \-fontconfig (fontconfig only)
> >  Enables the usage of fontconfig managed fonts.
> > +.br
> > +.I NOTE:
> > +When fontconfig is compiled in and \-ass turns on,
> > +this option is auto-enabled unless explicitly
> > +turn off this option in config file or command line.
>
> \-ass automatically turns this on unless explicitly overridden
> with \-nofontconfig.

Updated.


2007/12/12, Evgeniy Stepanov <eugeni.stepanov at gmail.com>:
> On Wednesday 12 December 2007 03:57:49 Ulion wrote:
> >
> > Sure, I found fontconfig_init and fixed it also, fontconfig_select was
> > already fixed in the patch, and _select_font only be called by
> > fontconfig_select, so I think it's ok now. Here's updated patch with
> > man page update.
>
> Seems ok.

OK, then commited, with updated man page patch from Diego.

And a missed place use font_fontconfig:

Index: libvo/font_load_ft.c
===================================================================
--- libvo/font_load_ft.c	(revision 25373)
+++ libvo/font_load_ft.c	(working copy)
@@ -1139,7 +1139,7 @@
     if (vo_font) free_font_desc(vo_font);

 #ifdef HAVE_FONTCONFIG
-    if (font_fontconfig)
+    if (font_fontconfig > 0)
     {
 	if (!font_name)
 	    font_name = strdup("sans-serif");

also commited in.


-- 
Ulion