mirror of
https://github.com/mpv-player/mpv
synced 2025-02-16 20:27:23 +00:00
Compiler/system compatibility fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11816 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1eca50edaa
commit
fda11ba080
@ -141,12 +141,6 @@ typedef struct mkv_demuxer
|
|||||||
} mkv_demuxer_t;
|
} mkv_demuxer_t;
|
||||||
|
|
||||||
|
|
||||||
#if __GNUC__ == 2
|
|
||||||
#pragma pack(2)
|
|
||||||
#else
|
|
||||||
#pragma pack(push,2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
uint32_t chunks; /* number of chunks */
|
uint32_t chunks; /* number of chunks */
|
||||||
@ -155,7 +149,7 @@ typedef struct
|
|||||||
uint32_t chunktab; /* offset to chunk offset array */
|
uint32_t chunktab; /* offset to chunk offset array */
|
||||||
} dp_hdr_t;
|
} dp_hdr_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct __attribute__((__packed__))
|
||||||
{
|
{
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
uint32_t fourcc1;
|
uint32_t fourcc1;
|
||||||
@ -169,7 +163,7 @@ typedef struct
|
|||||||
uint32_t type2;
|
uint32_t type2;
|
||||||
} real_video_props_t;
|
} real_video_props_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct __attribute__((__packed__))
|
||||||
{
|
{
|
||||||
uint32_t fourcc1; /* '.', 'r', 'a', 0xfd */
|
uint32_t fourcc1; /* '.', 'r', 'a', 0xfd */
|
||||||
uint16_t version1; /* 4 or 5 */
|
uint16_t version1; /* 4 or 5 */
|
||||||
@ -193,7 +187,7 @@ typedef struct
|
|||||||
uint16_t channels;
|
uint16_t channels;
|
||||||
} real_audio_v4_props_t;
|
} real_audio_v4_props_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct __attribute__((__packed__))
|
||||||
{
|
{
|
||||||
uint32_t fourcc1; /* '.', 'r', 'a', 0xfd */
|
uint32_t fourcc1; /* '.', 'r', 'a', 0xfd */
|
||||||
uint16_t version1; /* 4 or 5 */
|
uint16_t version1; /* 4 or 5 */
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef __EBML_H
|
#ifndef __EBML_H
|
||||||
#define __EBML_H
|
#define __EBML_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
|
|
||||||
/* EBML version supported */
|
/* EBML version supported */
|
||||||
|
Loading…
Reference in New Issue
Block a user