# HG changeset patch
# User reimar
# Date 1261236737 0
# Node ID 25ff7b3705239d916ac4daaeef56ae608fef835a
# Parent  b7b76236691d5170254f97dc652df98012188d1a
Never include ass.h and ass_types.h directly, use ass_mp.h instead.

diff -r b7b76236691d -r 25ff7b370523 command.c
--- a/command.c	Sat Dec 19 15:18:22 2009 +0000
+++ b/command.c	Sat Dec 19 15:32:17 2009 +0000
@@ -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"
diff -r b7b76236691d -r 25ff7b370523 libmpdemux/demuxer.h
--- a/libmpdemux/demuxer.h	Sat Dec 19 15:18:22 2009 +0000
+++ b/libmpdemux/demuxer.h	Sat Dec 19 15:32:17 2009 +0000
@@ -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
diff -r b7b76236691d -r 25ff7b370523 mpcommon.c
--- a/mpcommon.c	Sat Dec 19 15:18:22 2009 +0000
+++ b/mpcommon.c	Sat Dec 19 15:32:17 2009 +0000
@@ -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