changeset 6224:79b2b4c3c435

off_t fields reordered, to avoid problems due to struct padding
author arpi
date Wed, 29 May 2002 17:14:38 +0000
parents 7833c711d62b
children 75e8e1cf1f77
files libmpdemux/demuxer.h libmpdemux/stream.h
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demuxer.h	Wed May 29 00:32:52 2002 +0000
+++ b/libmpdemux/demuxer.h	Wed May 29 17:14:38 2002 +0000
@@ -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
--- a/libmpdemux/stream.h	Wed May 29 00:32:52 2002 +0000
+++ b/libmpdemux/stream.h	Wed May 29 17:14:38 2002 +0000
@@ -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