# HG changeset patch # User reimar # Date 1261650389 0 # Node ID 3a3370c00ba69347d3dc6af5853a2dc09f7b635d # Parent 54002b08fc789a5c9503ee34173bf9862f722ee5 Remove more direct includes of libass/ass.h diff -r 54002b08fc78 -r 3a3370c00ba6 gui/cfg.c --- a/gui/cfg.c Thu Dec 24 04:36:04 2009 +0000 +++ b/gui/cfg.c Thu Dec 24 10:26:29 2009 +0000 @@ -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 -r 54002b08fc78 -r 3a3370c00ba6 gui/interface.c --- a/gui/interface.c Thu Dec 24 04:36:04 2009 +0000 +++ b/gui/interface.c Thu Dec 24 10:26:29 2009 +0000 @@ -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 -r 54002b08fc78 -r 3a3370c00ba6 libmpcodecs/vf_ass.c --- a/libmpcodecs/vf_ass.c Thu Dec 24 04:36:04 2009 +0000 +++ b/libmpcodecs/vf_ass.c Thu Dec 24 10:26:29 2009 +0000 @@ -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 -r 54002b08fc78 -r 3a3370c00ba6 libmpcodecs/vf_vo.c --- a/libmpcodecs/vf_vo.c Thu Dec 24 04:36:04 2009 +0000 +++ b/libmpcodecs/vf_vo.c Thu Dec 24 10:26:29 2009 +0000 @@ -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 -r 54002b08fc78 -r 3a3370c00ba6 libvo/vo_gl.c --- a/libvo/vo_gl.c Thu Dec 24 04:36:04 2009 +0000 +++ b/libvo/vo_gl.c Thu Dec 24 10:26:29 2009 +0000 @@ -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 -r 54002b08fc78 -r 3a3370c00ba6 libvo/vo_vdpau.c --- a/libvo/vo_vdpau.c Thu Dec 24 04:36:04 2009 +0000 +++ b/libvo/vo_vdpau.c Thu Dec 24 10:26:29 2009 +0000 @@ -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 -r 54002b08fc78 -r 3a3370c00ba6 mencoder.c --- a/mencoder.c Thu Dec 24 04:36:04 2009 +0000 +++ b/mencoder.c Thu Dec 24 10:26:29 2009 +0000 @@ -213,7 +213,6 @@ { } -#include "libass/ass.h" #include "libass/ass_mp.h" char *current_module; #include "mpcommon.h" diff -r 54002b08fc78 -r 3a3370c00ba6 mplayer.c --- a/mplayer.c Thu Dec 24 04:36:04 2009 +0000 +++ b/mplayer.c Thu Dec 24 10:26:29 2009 +0000 @@ -315,7 +315,6 @@ int subcc_enabled=0; int suboverlap_enabled = 1; -#include "libass/ass.h" #include "libass/ass_mp.h" char* current_module=NULL; // for debugging