diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 15:32:17 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 15:32:17 +0000 |
| commit | 4ab63df7af7ceac58d3cb6a3068cb16b4e3ff6ee (patch) | |
| tree | f63639b8637a276187930c164094b72d82c96446 | |
| parent | 1f4109d85e5a788817321f44c45fa763bce5ffed (diff) | |
| download | mpv-4ab63df7af7ceac58d3cb6a3068cb16b4e3ff6ee.tar.bz2 mpv-4ab63df7af7ceac58d3cb6a3068cb16b4e3ff6ee.tar.xz | |
Never include ass.h and ass_types.h directly, use ass_mp.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30067 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | command.c | 1 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 2 | ||||
| -rw-r--r-- | mpcommon.c | 1 |
3 files changed, 1 insertions, 3 deletions
@@ -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 --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index bf0d4412ed..a2e9185b1e 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -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 --git a/mpcommon.c b/mpcommon.c index 81ed9c1113..2cdebe5305 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -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 |