[MPlayer-cvslog] r30105 - in trunk: gui/cfg.c gui/interface.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/vo_gl.c libvo/vo_vdpau.c mencoder.c mplayer.c

[reimar]

Author: reimar
Date: Thu Dec 24 11:26:29 2009
New Revision: 30105

Log:
Remove more direct includes of libass/ass.h

Modified:
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/libmpcodecs/vf_ass.c
   trunk/libmpcodecs/vf_vo.c
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_vdpau.c
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/gui/cfg.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/gui/interface.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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;

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/libmpcodecs/vf_ass.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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)

Modified: trunk/libmpcodecs/vf_vo.c
==============================================================================
--- trunk/libmpcodecs/vf_vo.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/libmpcodecs/vf_vo.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/libvo/vo_gl.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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 =

Modified: trunk/libvo/vo_vdpau.c
==============================================================================
--- trunk/libvo/vo_vdpau.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/libvo/vo_vdpau.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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 = {

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/mencoder.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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"

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Thu Dec 24 05:36:04 2009	(r30104)
+++ trunk/mplayer.c	Thu Dec 24 11:26:29 2009	(r30105)
@@ -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