[MPlayer-cvslog] r30623 - in trunk/libmpdemux: aviheader.h demux_avi.c

[diego]

Author: diego
Date: Thu Feb 18 00:10:56 2010
New Revision: 30623

Log:
Add read_avi_header() to aviheader.h; avoids forward declarations.

Modified:
   trunk/libmpdemux/aviheader.h
   trunk/libmpdemux/demux_avi.c

Modified: trunk/libmpdemux/aviheader.h
==============================================================================
--- trunk/libmpdemux/aviheader.h	Thu Feb 18 00:02:13 2010	(r30622)
+++ trunk/libmpdemux/aviheader.h	Thu Feb 18 00:10:56 2010	(r30623)
@@ -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 */

Modified: trunk/libmpdemux/demux_avi.c
==============================================================================
--- trunk/libmpdemux/demux_avi.c	Thu Feb 18 00:02:13 2010	(r30622)
+++ trunk/libmpdemux/demux_avi.c	Thu Feb 18 00:10:56 2010	(r30623)
@@ -434,8 +434,6 @@ int index_mode=-1;  // -1=untouched  0=d
 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;