summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpdemux/aviheader.h4
-rw-r--r--sub/av_sub.c1
-rw-r--r--sub/sd_ass.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h
index 6740c249ce..6c86378a4a 100644
--- a/libmpdemux/aviheader.h
+++ b/libmpdemux/aviheader.h
@@ -24,7 +24,6 @@
#include "config.h" /* get correct definition of HAVE_BIGENDIAN */
#include "libavutil/common.h"
#include "mpbswap.h"
-#include "demuxer.h"
#ifndef mmioFOURCC
#define mmioFOURCC( ch0, ch1, ch2, ch3 ) \
@@ -375,6 +374,7 @@ typedef struct {
#define AVI_IDX_OFFSET(x) ((((uint64_t)(x)->dwFlags&0xffff0000)<<16)+(x)->dwChunkOffset)
-void read_avi_header(demuxer_t *demuxer, int index_mode);
+struct demuxer;
+void read_avi_header(struct demuxer *demuxer, int index_mode);
#endif /* MPLAYER_AVIHEADER_H */
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"