[MPlayer-cvslog] CVS: main/libmpdemux nuppelvideo.h,1.2,1.3

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv30403/libmpdemux

Modified Files:
	nuppelvideo.h 
Log Message:
Specify the padding instead of expecting the compiler to align correctly


Index: nuppelvideo.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/nuppelvideo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nuppelvideo.h	3 Mar 2005 10:19:56 -0000	1.2
+++ nuppelvideo.h	25 May 2005 11:48:58 -0000	1.3
@@ -1,15 +1,17 @@
 /* nuppelvideo.h  rh */
 
-typedef struct rtfileheader
+typedef struct  __attribute__((packed)) rtfileheader
 {
   char finfo[12];     // "NuppelVideo" + \0
   char version[5];    // "0.05" + \0
+  char pad1[3];
   int  width;
   int  height;
   int  desiredwidth;  // 0 .. as it is
   int  desiredheight; // 0 .. as it is
   char pimode;        // P .. progressive
 		      // I .. interlaced  (2 half pics) [NI]
+  char pad2[3];
   double aspect;      // 1.0 .. square pixel (1.5 .. e.g. width=480: width*1.5=720
                       // for capturing for svcd material
   double fps;
@@ -19,7 +21,7 @@
   int keyframedist;
 } rtfileheader;
 
-typedef struct rtframeheader
+typedef struct  __attribute__((packed)) rtframeheader
 {
    char frametype;			// A .. Audio, V .. Video, S .. Sync, T .. Text
    					// R .. Seekpoint: String RTjjjjjjjj (use full packet)