diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-20 14:10:48 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-20 14:10:48 +0000 |
| commit | fda11ba080729de68fac348ec3681af595ef9536 (patch) | |
| tree | 186bed5d793c2a25632d0f829fd17a6b08f067ef /libmpdemux/demux_mkv.c | |
| parent | 1eca50edaa9decd70d3901af64e913ed1a02f1f5 (diff) | |
| download | mpv-fda11ba080729de68fac348ec3681af595ef9536.tar.bz2 mpv-fda11ba080729de68fac348ec3681af595ef9536.tar.xz | |
Compiler/system compatibility fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11816 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 5bc9665661..71c17bf7ee 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -141,12 +141,6 @@ typedef struct mkv_demuxer } 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 @@ typedef struct 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 @@ typedef struct 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 @@ typedef struct 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 */ |