[MPlayer-cvslog] r30067 - in trunk: command.c libmpdemux/demuxer.h mpcommon.c

[reimar]

Author: reimar
Date: Sat Dec 19 16:32:17 2009
New Revision: 30067

Log:
Include libass headers always and only indirectly via mp_ass.h

Modified:
   trunk/command.c
   trunk/libmpdemux/demuxer.h
   trunk/mpcommon.c

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Sat Dec 19 16:18:22 2009	(r30066)
+++ trunk/command.c	Sat Dec 19 16:32:17 2009	(r30067)
@@ -39,7 +39,6 @@
 #include "stream/stream_dvd.h"
 #endif
 #include "stream/stream_dvdnav.h"
-#include "libass/ass.h"
 #include "libass/ass_mp.h"
 #include "m_struct.h"
 #include "libmenu/menu.h"

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Sat Dec 19 16:18:22 2009	(r30066)
+++ trunk/libmpdemux/demuxer.h	Sat Dec 19 16:32:17 2009	(r30067)
@@ -26,7 +26,7 @@
 
 #include "stream/stream.h"
 #ifdef CONFIG_ASS
-#include "libass/ass_types.h"
+#include "libass/ass_mp.h"
 #endif
 
 #ifdef HAVE_BUILTIN_EXPECT

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Sat Dec 19 16:18:22 2009	(r30066)
+++ trunk/mpcommon.c	Sat Dec 19 16:32:17 2009	(r30067)
@@ -19,7 +19,6 @@
 double sub_last_pts = -303;
 
 #ifdef CONFIG_ASS
-#include "libass/ass.h"
 #include "libass/ass_mp.h"
 ass_track_t* ass_track = 0; // current track to render
 #endif