diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:10:56 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 23:10:56 +0000 |
| commit | 965f604636d3a3ee161dbdc818d6b323893bf2a1 (patch) | |
| tree | c0757827be19e6b05364940401b153c8f87d68bf /libmpdemux | |
| parent | d28c27df8d038c42c5da75946e6053daeb8031d9 (diff) | |
| download | mpv-965f604636d3a3ee161dbdc818d6b323893bf2a1.tar.bz2 mpv-965f604636d3a3ee161dbdc818d6b323893bf2a1.tar.xz | |
Add read_avi_header() to aviheader.h; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30623 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/aviheader.h | 3 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 4074f6bb03..6740c249ce 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -24,6 +24,7 @@ #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 ) \ @@ -374,4 +375,6 @@ 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); + #endif /* MPLAYER_AVIHEADER_H */ diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index e3f26d21d3..89ec44549e 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -434,8 +434,6 @@ int index_mode=-1; // -1=untouched 0=don't use index 1=use (generate) index char *index_file_save = NULL, *index_file_load = NULL; int force_ni=0; // force non-interleaved AVI parsing -void read_avi_header(demuxer_t *demuxer,int index_mode); - static demuxer_t* demux_open_avi(demuxer_t* demuxer){ demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; |