Mercurial > mplayer.hg

comparison libmpdemux/ms_hdr.h @ 26109:e53dac3c60ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately these identifiers appear in Windows system headers and are thus outside our direct control.
author diego
date Sun, 02 Mar 2008 19:38:50 +0000
parents d5641be6a896
children 69d26a2ce817
comparison
equal deleted inserted replaced
26108:113d412b50ee 26109:e53dac3c60ee
1 #ifndef MPLAYER_MS_HDR_H 1 #ifndef MPLAYER_MS_HDR_H
2 #define MPLAYER_MS_HDR_H 2 #define MPLAYER_MS_HDR_H
3 3
4 #ifndef WAVEFORMATEX_ 4 #ifndef _WAVEFORMATEX_
5 #define WAVEFORMATEX_ 5 #define _WAVEFORMATEX_
6 typedef struct __attribute__((__packed__)) WAVEFORMATEX { 6 typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
7 unsigned short wFormatTag; 7 unsigned short wFormatTag;
8 unsigned short nChannels; 8 unsigned short nChannels;
9 unsigned int nSamplesPerSec; 9 unsigned int nSamplesPerSec;
10 unsigned int nAvgBytesPerSec; 10 unsigned int nAvgBytesPerSec;
11 unsigned short nBlockAlign; 11 unsigned short nBlockAlign;
12 unsigned short wBitsPerSample; 12 unsigned short wBitsPerSample;
13 unsigned short cbSize; 13 unsigned short cbSize;
14 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; 14 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
15 #endif /* WAVEFORMATEX_ */ 15 #endif /* _WAVEFORMATEX_ */
16 16
17 #ifndef MPEGLAYER3WAVEFORMAT_ 17 #ifndef _MPEGLAYER3WAVEFORMAT_
18 #define MPEGLAYER3WAVEFORMAT_ 18 #define _MPEGLAYER3WAVEFORMAT_
19 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { 19 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
20 WAVEFORMATEX wf; 20 WAVEFORMATEX wf;
21 unsigned short wID; 21 unsigned short wID;
22 unsigned int fdwFlags; 22 unsigned int fdwFlags;
23 unsigned short nBlockSize; 23 unsigned short nBlockSize;
24 unsigned short nFramesPerBlock; 24 unsigned short nFramesPerBlock;
25 unsigned short nCodecDelay; 25 unsigned short nCodecDelay;
26 } MPEGLAYER3WAVEFORMAT; 26 } MPEGLAYER3WAVEFORMAT;
27 #endif /* MPEGLAYER3WAVEFORMAT_ */ 27 #endif /* _MPEGLAYER3WAVEFORMAT_ */
28 28
29 /* windows.h #includes wingdi.h on MinGW. */ 29 /* windows.h #includes wingdi.h on MinGW. */
30 #if !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) 30 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
31 #define BITMAPINFOHEADER_ 31 #define _BITMAPINFOHEADER_
32 typedef struct __attribute__((__packed__)) 32 typedef struct __attribute__((__packed__))
33 { 33 {
34 int biSize; 34 int biSize;
35 int biWidth; 35 int biWidth;
36 int biHeight; 36 int biHeight;
45 } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; 45 } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
46 typedef struct { 46 typedef struct {
47 BITMAPINFOHEADER bmiHeader; 47 BITMAPINFOHEADER bmiHeader;
48 int bmiColors[1]; 48 int bmiColors[1];
49 } BITMAPINFO, *LPBITMAPINFO; 49 } BITMAPINFO, *LPBITMAPINFO;
50 #endif /* !defined(BITMAPINFOHEADER_) && !defined(_WINGDI_H) */ 50 #endif
51 51
52 #ifndef le2me_BITMAPINFOHEADER 52 #ifndef le2me_BITMAPINFOHEADER
53 #ifdef WORDS_BIGENDIAN 53 #ifdef WORDS_BIGENDIAN
54 #define le2me_BITMAPINFOHEADER(h) { \ 54 #define le2me_BITMAPINFOHEADER(h) { \
55 (h)->biSize = le2me_32((h)->biSize); \ 55 (h)->biSize = le2me_32((h)->biSize); \