Mercurial > mplayer.hg
comparison sub/ass_mp.c @ 36645:289d315088ad
Fix bug with option '-fontconfig' and ass subtitles.
The condition for using fontconfig for ass subtitles
is font_fontconfig >= 0. Pass this to libass.
Option '-nofontconfig' won't have an effect else.
author | ib |
---|---|
date | Sun, 26 Jan 2014 12:53:26 +0000 |
parents | 7f3dbf4bf1d5 |
children |
comparison
equal
deleted
inserted
replaced
36644:8d39d6874ec0 | 36645:289d315088ad |
---|---|
278 else path = get_path("subfont.ttf"); | 278 else path = get_path("subfont.ttf"); |
279 if (font_fontconfig >= 0 && sub_font_name) family = strdup(sub_font_name); | 279 if (font_fontconfig >= 0 && sub_font_name) family = strdup(sub_font_name); |
280 else if (font_fontconfig >= 0 && font_name) family = strdup(font_name); | 280 else if (font_fontconfig >= 0 && font_name) family = strdup(font_name); |
281 else family = 0; | 281 else family = 0; |
282 | 282 |
283 ass_set_fonts(priv, path, family, font_fontconfig, NULL, 1); | 283 ass_set_fonts(priv, path, family, font_fontconfig >= 0, NULL, 1); |
284 | 284 |
285 free(dir); | 285 free(dir); |
286 free(path); | 286 free(path); |
287 free(family); | 287 free(family); |
288 } | 288 } |