Mercurial > mplayer.hg

comparison libass/ass_mp.c @ 30197:871e061553bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix libass API checks libass API changed in 0.9.7, not 0.9.8.
author greg
date Fri, 08 Jan 2010 18:07:12 +0000
parents a2e4fd61dc4a
children 7446f58b6899
comparison
equal deleted inserted replaced
30196:aa855d89fc9d 30197:871e061553bb
238 else path = get_path("subfont.ttf"); 238 else path = get_path("subfont.ttf");
239 if (font_fontconfig >= 0 && sub_font_name) family = strdup(sub_font_name); 239 if (font_fontconfig >= 0 && sub_font_name) family = strdup(sub_font_name);
240 else if (font_fontconfig >= 0 && font_name) family = strdup(font_name); 240 else if (font_fontconfig >= 0 && font_name) family = strdup(font_name);
241 else family = 0; 241 else family = 0;
242 242
243 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000 243 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00907010
244 ass_set_fonts(priv, path, family, font_fontconfig, NULL, 1); 244 ass_set_fonts(priv, path, family, font_fontconfig, NULL, 1);
245 #else 245 #else
246 if (font_fontconfig >= 0) 246 if (font_fontconfig >= 0)
247 ass_set_fonts(priv, path, family); 247 ass_set_fonts(priv, path, family);
248 else 248 else