Mercurial > mplayer.hg
changeset 34013:18dfcac48055
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.
| author | diego |
|---|---|
| date | Mon, 12 Sep 2011 23:36:00 +0000 |
| parents | fceaeb11f890 |
| children | 02385e7d82cd |
| files | libmpdemux/demuxer.c libmpdemux/demuxer.h mpcommon.c |
| diffstat | 3 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Mon Sep 12 23:08:39 2011 +0000 +++ b/libmpdemux/demuxer.c Mon Sep 12 23:36:00 2011 +0000 @@ -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"
--- a/libmpdemux/demuxer.h Mon Sep 12 23:08:39 2011 +0000 +++ b/libmpdemux/demuxer.h Mon Sep 12 23:36:00 2011 +0000 @@ -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
--- a/mpcommon.c Mon Sep 12 23:08:39 2011 +0000 +++ b/mpcommon.c Mon Sep 12 23:36:00 2011 +0000 @@ -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