diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 00:43:14 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-22 00:43:14 +0000 |
commit | 61c5a99851ea41449a513619dd68791c93e30ef3 (patch) | |
tree | dca11ab9a0e1c6948e2638b9898f235556187cc5 /libmpdemux | |
parent | 2059c26359a74ba82f26e57cd88851bdce377214 (diff) | |
download | mpv-61c5a99851ea41449a513619dd68791c93e30ef3.tar.bz2 mpv-61c5a99851ea41449a513619dd68791c93e30ef3.tar.xz |
wine headers cleanup
- WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h
- lots of useless include wine/* removed from mplayer code
- fixed few warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7472 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/aviprint.c | 1 | ||||
-rw-r--r-- | libmpdemux/stheader.h | 42 |
2 files changed, 38 insertions, 5 deletions
diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index f5567286ef..87d02ea350 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -5,6 +5,7 @@ #include "config.h" +// for avi_stream_id(): #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 4222630238..559af7d67f 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -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" -#include "../libmpcodecs/mp_image.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_ */ + +#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; |