Mercurial > mplayer.hg

changeset 11815:0fa6f4fcfcbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compiler/system compatibility fixes.
author mosu
date Tue, 20 Jan 2004 14:10:48 +0000
parents 9e88ceb462c7
children 637af9175b65
files libmpdemux/demux_mkv.c libmpdemux/ebml.h
diffstat 2 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.c	Tue Jan 20 13:32:05 2004 +0000
+++ b/libmpdemux/demux_mkv.c	Tue Jan 20 14:10:48 2004 +0000
@@ -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 */
--- a/libmpdemux/ebml.h	Tue Jan 20 13:32:05 2004 +0000
+++ b/libmpdemux/ebml.h	Tue Jan 20 14:10:48 2004 +0000
@@ -1,7 +1,7 @@
 #ifndef __EBML_H
 #define __EBML_H
 
-#include <stdint.h>
+#include <inttypes.h>
 
 
 /* EBML version supported */