[MPlayer-cvslog] r34101 - in trunk: libmpdemux/demuxer.c libmpdemux/demuxer.h mpcommon.c

[diego]

Author: diego
Date: Tue Sep 13 01:36:00 2011
New Revision: 34101

Log:
libass: consistently #include sub/ass_mp.h without #ifdefs

The header is safe to include without #ifdef guards and
already #included without guards in most places.

Modified:
   trunk/libmpdemux/demuxer.c
   trunk/libmpdemux/demuxer.h
   trunk/mpcommon.c

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Tue Sep 13 01:08:39 2011	(r34100)
+++ trunk/libmpdemux/demuxer.c	Tue Sep 13 01:36:00 2011	(r34101)
@@ -44,10 +44,7 @@
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/dec_teletext.h"
-
-#ifdef CONFIG_ASS
 #include "sub/ass_mp.h"
-#endif
 
 #ifdef CONFIG_FFMPEG
 #include "libavcodec/avcodec.h"

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	Tue Sep 13 01:08:39 2011	(r34100)
+++ trunk/libmpdemux/demuxer.h	Tue Sep 13 01:36:00 2011	(r34101)
@@ -25,9 +25,7 @@
 #include <string.h>
 
 #include "stream/stream.h"
-#ifdef CONFIG_ASS
 #include "sub/ass_mp.h"
-#endif
 #include "m_option.h"
 
 #ifdef HAVE_BUILTIN_EXPECT

Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c	Tue Sep 13 01:08:39 2011	(r34100)
+++ trunk/mpcommon.c	Tue Sep 13 01:36:00 2011	(r34101)
@@ -43,6 +43,7 @@
 #include "parser-cfg.h"
 #include "sub/spudec.h"
 #include "version.h"
+#include "sub/ass_mp.h"
 #include "sub/vobsub.h"
 #include "sub/av_sub.h"
 #include "libmpcodecs/dec_teletext.h"
@@ -53,7 +54,6 @@
 double sub_last_pts = -303;
 
 #ifdef CONFIG_ASS
-#include "sub/ass_mp.h"
 ASS_Track* ass_track = 0; // current track to render
 #endif