Mercurial > mplayer.hg

changeset 30026:868442ec038e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make ass_mp.h use the system-libass headers when the internal one is disabled.
author reimar
date Sat, 19 Dec 2009 15:41:47 +0000
parents 25ff7b370523
children f1651b3af651
files configure libass/ass_mp.h
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Dec 19 15:32:17 2009 +0000
+++ b/configure	Sat Dec 19 15:41:47 2009 +0000
@@ -6180,6 +6180,11 @@
 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 @@
 
 /* font stuff */
 $def_ass
+$def_ass_internal
 $def_bitmap_font
 $def_enca
 $def_fontconfig
--- a/libass/ass_mp.h	Sat Dec 19 15:32:17 2009 +0000
+++ b/libass/ass_mp.h	Sat Dec 19 15:41:47 2009 +0000
@@ -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;