comparison loader/wine/mmreg.h @ 24406:a422b6c96368

Revert r24424. Fix is wrong, because 'packed' attribute can be placed before structure definition only when all members have this attribute.
author voroshil
date Mon, 10 Sep 2007 18:55:52 +0000
parents 67e6bb7dcac4
children c98c9e7f3bd0
comparison
equal deleted inserted replaced
24405:3758413ca0c6 24406:a422b6c96368
88 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; 88 } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
89 #endif // !_WAVEFORMATEXTENSIBLE_ 89 #endif // !_WAVEFORMATEXTENSIBLE_
90 90
91 #ifndef _MPEGLAYER3WAVEFORMAT_ 91 #ifndef _MPEGLAYER3WAVEFORMAT_
92 #define _MPEGLAYER3WAVEFORMAT_ 92 #define _MPEGLAYER3WAVEFORMAT_
93 typedef struct WINE_PACKED mpeglayer3waveformat_tag { 93 typedef struct mpeglayer3waveformat_tag {
94 WORD wFormatTag; 94 WORD wFormatTag WINE_PACKED;
95 WORD nChannels; 95 WORD nChannels WINE_PACKED;
96 DWORD nSamplesPerSec; 96 DWORD nSamplesPerSec WINE_PACKED;
97 DWORD nAvgBytesPerSec; 97 DWORD nAvgBytesPerSec WINE_PACKED;
98 WORD nBlockAlign; 98 WORD nBlockAlign WINE_PACKED;
99 WORD wBitsPerSample; 99 WORD wBitsPerSample WINE_PACKED;
100 WORD cbSize; 100 WORD cbSize WINE_PACKED;
101 WORD wID; 101 WORD wID WINE_PACKED;
102 DWORD fdwFlags; 102 DWORD fdwFlags WINE_PACKED;
103 WORD nBlockSize; 103 WORD nBlockSize WINE_PACKED;
104 WORD nFramesPerBlock; 104 WORD nFramesPerBlock WINE_PACKED;
105 WORD nCodecDelay; 105 WORD nCodecDelay WINE_PACKED;
106 } MPEGLAYER3WAVEFORMAT; 106 } MPEGLAYER3WAVEFORMAT;
107 #endif /* !_MPEGLAYER3WAVEFORMAT_ */ 107 #endif /* !_MPEGLAYER3WAVEFORMAT_ */
108 108
109 /* WAVE form wFormatTag IDs */ 109 /* WAVE form wFormatTag IDs */
110 110