Mercurial > mplayer.hg
comparison libmpdemux/asf.h @ 27468:536dbf7632ea
Remove unused GUID_t definition that also incorrectly defined GUID_DEFINED
(while actually not defining GUID, only GUID_t).
author | reimar |
---|---|
date | Sun, 31 Aug 2008 11:21:29 +0000 |
parents | 4129c8cfa742 |
children | d643e4643313 |
comparison
equal
deleted
inserted
replaced
27467:239a049163eb | 27468:536dbf7632ea |
---|---|
3 | 3 |
4 //#include "config.h" /* for WORDS_BIGENDIAN */ | 4 //#include "config.h" /* for WORDS_BIGENDIAN */ |
5 #include <inttypes.h> | 5 #include <inttypes.h> |
6 #include "libavutil/common.h" | 6 #include "libavutil/common.h" |
7 #include "mpbswap.h" | 7 #include "mpbswap.h" |
8 | |
9 /////////////////////// | |
10 // MS GUID definition | |
11 /////////////////////// | |
12 #ifndef GUID_DEFINED | |
13 #define GUID_DEFINED | |
14 // Size of GUID is 16 bytes! | |
15 typedef struct __attribute__((packed)) { | |
16 uint32_t Data1; // 4 bytes | |
17 uint16_t Data2; // 2 bytes | |
18 uint16_t Data3; // 2 bytes | |
19 uint8_t Data4[8]; // 8 bytes | |
20 } GUID_t; | |
21 #endif | |
22 | 8 |
23 /////////////////////// | 9 /////////////////////// |
24 // ASF Object Header | 10 // ASF Object Header |
25 /////////////////////// | 11 /////////////////////// |
26 typedef struct __attribute__((packed)) { | 12 typedef struct __attribute__((packed)) { |