summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-24 10:26:29 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-24 10:26:29 +0000
commit2908957147cd336e16da6bbe28c461abbb2df38f (patch)
treee3ce7ddd69ede62e73b8e497729ef220c47c16c8
parenta0601ed2566d132fec57dcf163372f9f341f3c13 (diff)
downloadmpv-2908957147cd336e16da6bbe28c461abbb2df38f.tar.bz2
mpv-2908957147cd336e16da6bbe28c461abbb2df38f.tar.xz
Remove more direct includes of libass/ass.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--gui/cfg.c1
-rw-r--r--gui/interface.c1
-rw-r--r--libmpcodecs/vf_ass.c1
-rw-r--r--libmpcodecs/vf_vo.c1
-rw-r--r--libvo/vo_gl.c1
-rw-r--r--libvo/vo_vdpau.c1
-rw-r--r--mencoder.c1
-rw-r--r--mplayer.c1
8 files changed, 0 insertions, 8 deletions
diff --git a/gui/cfg.c b/gui/cfg.c
index a57fa3db9d..3d54f7aad7 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -32,7 +32,6 @@
#include "libvo/video_out.h"
#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
-#include "libass/ass.h"
#include "libass/ass_mp.h"
#include "cfg.h"
diff --git a/gui/interface.c b/gui/interface.c
index 4a2103ec84..3351656d87 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -46,7 +46,6 @@
#include "mixer.h"
#include "libaf/af.h"
#include "libaf/equalizer.h"
-#include "libass/ass.h"
#include "libass/ass_mp.h"
extern af_cfg_t af_cfg;
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 8d88e44f1b..6e524dcd84 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -41,7 +41,6 @@
#include "m_option.h"
#include "m_struct.h"
-#include "libass/ass.h"
#include "libass/ass_mp.h"
#define _r(c) ((c)>>24)
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index affffa6bde..e31e5c545b 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -11,7 +11,6 @@
#include "libvo/video_out.h"
#ifdef CONFIG_ASS
-#include "libass/ass.h"
#include "libass/ass_mp.h"
extern ass_track_t* ass_track;
#endif
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 712c0439ec..5aa10bf71e 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -35,7 +35,6 @@
#include "gui/interface.h"
#endif
#include "fastmemcpy.h"
-#include "libass/ass.h"
#include "libass/ass_mp.h"
static const vo_info_t info =
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 35e80768aa..6c68210386 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -50,7 +50,6 @@
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
-#include "libass/ass.h"
#include "libass/ass_mp.h"
static vo_info_t info = {
diff --git a/mencoder.c b/mencoder.c
index c823f3349a..6ff49a5350 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -213,7 +213,6 @@ void mplayer_put_key(int code)
{
}
-#include "libass/ass.h"
#include "libass/ass_mp.h"
char *current_module;
#include "mpcommon.h"
diff --git a/mplayer.c b/mplayer.c
index 37f176dc83..587b03e920 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -315,7 +315,6 @@ char *vobsub_name=NULL;
int subcc_enabled=0;
int suboverlap_enabled = 1;
-#include "libass/ass.h"
#include "libass/ass_mp.h"
char* current_module=NULL; // for debugging