Mercurial > mplayer.hg
diff libmpdemux/stheader.h @ 7471:5e56ce70b551
wine headers cleanup
- WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h
- lots of useless include wine/* removed from mplayer code
- fixed few warnings
author | arpi |
---|---|
date | Sun, 22 Sep 2002 00:43:14 +0000 |
parents | 3a22c16fea46 |
children | 32efb806436e |
line wrap: on
line diff
--- a/libmpdemux/stheader.h Sun Sep 22 00:39:13 2002 +0000 +++ b/libmpdemux/stheader.h Sun Sep 22 00:43:14 2002 +0000 @@ -1,13 +1,45 @@ #ifndef __ST_HEADER_H #define __ST_HEADER_H 1 -// Stream headers: - -#include "wine/mmreg.h" +// for AVIStreamHeader: #include "wine/avifmt.h" -#include "wine/vfw.h" + +#ifndef _WAVEFORMATEX_ +#define _WAVEFORMATEX_ +typedef struct __attribute__((__packed__)) _WAVEFORMATEX { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; +} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; +#endif /* _WAVEFORMATEX_ */ -#include "../libmpcodecs/mp_image.h" +#ifndef _BITMAPINFOHEADER_ +#define _BITMAPINFOHEADER_ +typedef struct __attribute__((__packed__)) +{ + int biSize; + int biWidth; + int biHeight; + short biPlanes; + short biBitCount; + int biCompression; + int biSizeImage; + int biXPelsPerMeter; + int biYPelsPerMeter; + int biClrUsed; + int biClrImportant; +} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; +typedef struct { + BITMAPINFOHEADER bmiHeader; + int bmiColors[1]; +} BITMAPINFO, *LPBITMAPINFO; +#endif + +// Stream headers: typedef struct { demux_stream_t *ds;