[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.c, 1.3, 1.4 ebml.h, 1.1, 1.2

[Moritz Bunkus CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/scsi/2/tmp/cvs-serv31207

Modified Files:
	demux_mkv.c ebml.h 
Log Message:
Compiler/system compatibility fixes.

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demux_mkv.c	20 Jan 2004 09:57:19 -0000	1.3
+++ demux_mkv.c	20 Jan 2004 14:10:48 -0000	1.4
@@ -141,12 +141,6 @@
 } mkv_demuxer_t;
 
 
-#if __GNUC__ == 2
-#pragma pack(2)
-#else
-#pragma pack(push,2)
-#endif
-
 typedef struct
 {
   uint32_t chunks;              /* number of chunks */
@@ -155,7 +149,7 @@
   uint32_t chunktab;            /* offset to chunk offset array */
 } dp_hdr_t;
 
-typedef struct
+typedef struct __attribute__((__packed__))
 {
   uint32_t size;
   uint32_t fourcc1;
@@ -169,7 +163,7 @@
   uint32_t type2;
 } real_video_props_t;
 
-typedef struct
+typedef struct __attribute__((__packed__))
 {
   uint32_t fourcc1;             /* '.', 'r', 'a', 0xfd */
   uint16_t version1;            /* 4 or 5 */
@@ -193,7 +187,7 @@
   uint16_t channels;
 } real_audio_v4_props_t;
 
-typedef struct
+typedef struct __attribute__((__packed__))
 {
   uint32_t fourcc1;             /* '.', 'r', 'a', 0xfd */
   uint16_t version1;            /* 4 or 5 */

Index: ebml.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ebml.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ebml.h	19 Jan 2004 19:16:10 -0000	1.1
+++ ebml.h	20 Jan 2004 14:10:48 -0000	1.2
@@ -1,7 +1,7 @@
 #ifndef __EBML_H
 #define __EBML_H
 
-#include <stdint.h>
+#include <inttypes.h>
 
 
 /* EBML version supported */