summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-08-19 05:17:02 +0300
committerUoti Urpala <uau@mplayer2.org>2011-08-19 21:37:16 +0300
commitb2e213d88976f166b115fc6de6e3c4105d128576 (patch)
treef320ca30c5dfedf0a98fca1e3b55cd1566c8995a /sub
parent6e8d420a419329d95ac35d520c7a26588f7a51cc (diff)
downloadmpv-b2e213d88976f166b115fc6de6e3c4105d128576.tar.bz2
mpv-b2e213d88976f166b115fc6de6e3c4105d128576.tar.xz
aviheader.h: avoid including demuxer.h
Remove unnecessary demuxer.h include from aviheader.h. Through stheader.h aviheader.h is included in a lot of files. Add missing mp_msg.h includes to av_sub.c and sd_ass.c (previously hidden by indirect inclusion through demuxer.h and stream.h).
Diffstat (limited to 'sub')
-rw-r--r--sub/av_sub.c1
-rw-r--r--sub/sd_ass.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/sub/av_sub.c b/sub/av_sub.c
index 88f84db104..fdef2a57f5 100644
--- a/sub/av_sub.c
+++ b/sub/av_sub.c
@@ -18,6 +18,7 @@
#include <libavcodec/avcodec.h>
+#include "mp_msg.h"
#include "libmpdemux/stheader.h"
#include "sub.h"
#include "spudec.h"
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index d7556ca203..e386cb50d9 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -24,6 +24,7 @@
#include "talloc.h"
#include "mpcommon.h"
+#include "mp_msg.h"
#include "libmpdemux/stheader.h"
#include "sub.h"
#include "ass_mp.h"