From 12758932b22d1fb732c260c00aba2ba9f6f9b0c4 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 29 May 2002 17:14:38 +0000
Subject: [PATCH] off_t fields reordered, to avoid problems due to struct
 padding

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6225 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demuxer.h | 8 ++++----
 libmpdemux/stream.h  | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 417c43e546..5db46fd8b2 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -96,13 +96,13 @@ typedef struct demuxer_info_st {
 #define MAX_V_STREAMS 256
 
 typedef struct demuxer_st {
-  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;
+  stream_t *stream;
+  int synced;  // stream synced (used by mpeg)
+  int type;    // demuxer type: mpeg PS, mpeg ES, avi, avi-ni, avi-nini, asf
+  int file_format;  // file format: mpeg/avi/asf
   int seekable;  // flag
   //
   demux_stream_t *audio; // audio buffer/demuxer
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index c5d4dc465f..1676db2156 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -35,11 +35,10 @@ void vcd_cache_init(int s);
 
 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