Mercurial > mplayer.hg

diff libass/ass_mp.c @ 30065:d5d20b8256b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some ugly hacks to make compiling against a newer external version of libass work.
author reimar
date Thu, 24 Dec 2009 10:51:24 +0000
parents 73a32da1ef18
children a2e4fd61dc4a
line wrap: on
line diff
--- a/libass/ass_mp.c	Thu Dec 24 10:45:05 2009 +0000
+++ b/libass/ass_mp.c	Thu Dec 24 10:51:24 2009 +0000
@@ -27,10 +27,7 @@
 #include "mp_msg.h"
 #include "get_path.h"
 
-#include "ass.h"
-#include "ass_utils.h"
 #include "ass_mp.h"
-#include "ass_library.h"
 
 #ifdef CONFIG_FONTCONFIG
 #include <fontconfig/fontconfig.h>
@@ -243,10 +240,14 @@
 	else if (font_fontconfig >= 0 && font_name) family = strdup(font_name);
 	else family = 0;
 
+#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000
+        ass_set_fonts(priv, path, family, font_fontconfig, NULL, 1);
+#else
 	if (font_fontconfig >= 0)
 		ass_set_fonts(priv, path, family);
 	else
 		ass_set_fonts_nofc(priv, path, family);
+#endif
 
 	free(dir);
 	free(path);