Mercurial > mplayer.hg
changeset 30581:fef54a0e6ec2
Add read_avi_header() to aviheader.h; avoids forward declarations.
| author | diego |
|---|---|
| date | Wed, 17 Feb 2010 23:10:56 +0000 |
| parents | a25d16882312 |
| children | 85aaf16401b5 |
| files | libmpdemux/aviheader.h libmpdemux/demux_avi.c |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/aviheader.h Wed Feb 17 23:02:13 2010 +0000 +++ b/libmpdemux/aviheader.h Wed Feb 17 23:10:56 2010 +0000 @@ -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 @@ #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 */
--- a/libmpdemux/demux_avi.c Wed Feb 17 23:02:13 2010 +0000 +++ b/libmpdemux/demux_avi.c Wed Feb 17 23:10:56 2010 +0000 @@ -434,8 +434,6 @@ 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;