Mercurial > mplayer.hg

changeset 30025:25ff7b370523

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Never include ass.h and ass_types.h directly, use ass_mp.h instead.
author reimar
date Sat, 19 Dec 2009 15:32:17 +0000
parents b7b76236691d
children 868442ec038e
files command.c libmpdemux/demuxer.h mpcommon.c
diffstat 3 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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
--- 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