Mercurial > mplayer.hg

comparison libmpdemux/ms_hdr.h @ 12979:6f18105c058a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better protection against double definition of MPEGLAYER3WAVEFORMAT
author wight
date Mon, 09 Aug 2004 15:53:10 +0000
parents 0db4a3a5b01d
children 20673742a6e7
comparison
equal deleted inserted replaced
12978:fd3f2cacd434 12979:6f18105c058a
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_
18 #define _MPEGLAYER3WAVEFORMAT_
17 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { 19 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
18 WAVEFORMATEX wf; 20 WAVEFORMATEX wf;
19 unsigned short wID; 21 unsigned short wID;
20 unsigned int fdwFlags; 22 unsigned int fdwFlags;
21 unsigned short nBlockSize; 23 unsigned short nBlockSize;
22 unsigned short nFramesPerBlock; 24 unsigned short nFramesPerBlock;
23 unsigned short nCodecDelay; 25 unsigned short nCodecDelay;
24 } MPEGLAYER3WAVEFORMAT; 26 } MPEGLAYER3WAVEFORMAT;
27 #endif /* _MPEGLAYER3WAVEFORMAT_ */
25 28
26 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H) 29 #if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
27 #define _BITMAPINFOHEADER_ 30 #define _BITMAPINFOHEADER_
28 typedef struct __attribute__((__packed__)) 31 typedef struct __attribute__((__packed__))
29 { 32 {