diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-24 10:51:24 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-24 10:51:24 +0000 |
| commit | 6023874828599e37e14056e5fc10325adfdba50c (patch) | |
| tree | 86331fba2927b1a4494b10a25f662702b61ecc11 /libass | |
| parent | 1414f844c565a5c0170bb7250eafbd84ffdb93c6 (diff) | |
| download | mpv-6023874828599e37e14056e5fc10325adfdba50c.tar.bz2 mpv-6023874828599e37e14056e5fc10325adfdba50c.tar.xz | |
Some ugly hacks to make compiling against a newer external version of libass work.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_mp.c | 7 | ||||
| -rw-r--r-- | libass/ass_mp.h | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 3e56ccb295..290f383786 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -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 @@ void ass_configure_fonts(ass_renderer_t* priv) { 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); diff --git a/libass/ass_mp.h b/libass/ass_mp.h index fb99386351..47c683c5fd 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -29,6 +29,15 @@ #else #include <ass/ass.h> #endif +#if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000 +#define ass_library_t ASS_Library +#define ass_track_t ASS_Track +#define ass_track_s ASS_Track +#define ass_renderer_t ASS_Renderer +#define ass_image_t ASS_Image +#define ass_style_t ASS_Style +#define ass_event_t ASS_Event +#endif extern ass_library_t* ass_library; extern int ass_enabled; |