RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-28 03:10:55 +00:00
Code Issues Releases Wiki Activity

aviheader.h: avoid including demuxer.h

Browse Source 
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).
This commit is contained in:
Uoti Urpala 2011-08-19 05:17:02 +03:00
parent 6e8d420a41
commit b2e213d889
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpdemux/aviheader.h
View File

@ -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 */

1
sub/av_sub.c
View File

@ -18,6 +18,7 @@
#include <libavcodec/avcodec.h>
#include "mp_msg.h"
#include "libmpdemux/stheader.h"
#include "sub.h"
#include "spudec.h"

1
sub/sd_ass.c
View File

@ -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"