diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 15:41:47 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 15:41:47 +0000 |
| commit | bfd01bdc1700bac53392dc827f3f7870124d0406 (patch) | |
| tree | cdd177180b7beadfa8a8520740bfa5b37ee6abff | |
| parent | 4ab63df7af7ceac58d3cb6a3068cb16b4e3ff6ee (diff) | |
| download | mpv-bfd01bdc1700bac53392dc827f3f7870124d0406.tar.bz2 mpv-bfd01bdc1700bac53392dc827f3f7870124d0406.tar.xz | |
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
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libass/ass_mp.h | 5 |
2 files changed, 10 insertions, 1 deletions
@@ -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 diff --git a/libass/ass_mp.h b/libass/ass_mp.h index 64b411a550..1c013c0db9 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -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; |