[Mplayer-cvslog] CVS: main/libmpdemux demuxer.h,1.39,1.40 stream.h,1.40,1.41

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv8209

Modified Files:
	demuxer.h stream.h 
Log Message:
off_t fields reordered, to avoid problems due to struct padding


Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- demuxer.h	25 May 2002 22:13:23 -0000	1.39
+++ demuxer.h	29 May 2002 17:14:38 -0000	1.40
@@ -96,13 +96,13 @@
 #define MAX_V_STREAMS 256
 
 typedef struct demuxer_st {
+  off_t filepos; // input stream current pos.
+  off_t movi_start;
+  off_t movi_end;
   stream_t *stream;
   int synced;  // stream synced (used by mpeg)
-  off_t filepos; // input stream current pos.
   int type;    // demuxer type: mpeg PS, mpeg ES, avi, avi-ni, avi-nini, asf
   int file_format;  // file format: mpeg/avi/asf
-  off_t movi_start;
-  off_t movi_end;
   int seekable;  // flag
   //
   demux_stream_t *audio; // audio buffer/demuxer

Index: stream.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- stream.h	24 Apr 2002 21:19:09 -0000	1.40
+++ stream.h	29 May 2002 17:14:38 -0000	1.41
@@ -35,11 +35,10 @@
 
 typedef struct {
   int fd;
-  off_t pos;
-  int eof;
   int type; // 0=file 1=VCD
   unsigned int buf_pos,buf_len;
-  off_t start_pos,end_pos;
+  off_t pos,start_pos,end_pos;
+  int eof;
   unsigned int cache_pid;
   void* cache_data;
   void* priv; // used for DVD