Mercurial > mplayer.hg

changeset 19588:0b5aaf5cda6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix: strdup of NULL value.
author eugeni
date Tue, 29 Aug 2006 18:15:48 +0000
parents 23b2f53f03d2
children d5c80704c04c
files libass/ass_mp.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_mp.c	Tue Aug 29 17:40:30 2006 +0000
+++ b/libass/ass_mp.c	Tue Aug 29 18:15:48 2006 +0000
@@ -48,7 +48,7 @@
 	sid = ass_alloc_style(track);
 	style = track->styles + sid;
 	style->Name = strdup("Default");
-	style->FontName = font_fontconfig ? strdup(font_name) : strdup("Tahoma");
+	style->FontName = (font_fontconfig && font_name) ? strdup(font_name) : strdup("Tahoma");
 
 	fs = track->PlayResY * text_font_scale_factor / 100. / ass_internal_font_size_coeff;
 	// approximate autoscale coefficients