RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Make ass_mp.h use the system-libass headers when the internal one is disabled. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30068 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-12-19 15:41:47 +00:00
parent 4ab63df7af
commit bfd01bdc17
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -6180,6 +6180,11 @@ if test "$_ass" = yes ; then
else
def_ass='#undef CONFIG_ASS'
fi
if test "$ass_internal" = yes ; then
def_ass_internal='#define CONFIG_ASS_INTERNAL 1'
else
def_ass_internal='#undef CONFIG_ASS_INTERNAL'
fi
echores "$_ass"
@ -8772,6 +8777,7 @@ $def_tv_v4l2
/* font stuff */
$def_ass
$def_ass_internal
$def_bitmap_font
$def_enca
$def_fontconfig

5
libass/ass_mp.h
View File

@ -24,8 +24,11 @@
#define LIBASS_MP_H
#include "subreader.h"
#include "ass_types.h"
#ifdef CONFIG_LIBASS_INTERNAL
#include "ass.h"
#else
#include <ass/ass.h>
#endif
extern ass_library_t* ass_library;
extern int ass_enabled;