[MPlayer-cvslog] r30068 - in trunk: configure libass/ass_mp.h

[reimar]

Author: reimar
Date: Sat Dec 19 16:41:47 2009
New Revision: 30068

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

Modified:
   trunk/configure
   trunk/libass/ass_mp.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Dec 19 16:32:17 2009	(r30067)
+++ trunk/configure	Sat Dec 19 16:41:47 2009	(r30068)
@@ -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

Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h	Sat Dec 19 16:32:17 2009	(r30067)
+++ trunk/libass/ass_mp.h	Sat Dec 19 16:41:47 2009	(r30068)
@@ -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;