Mercurial > mplayer.hg
diff libmpdemux/stheader.h @ 12341:0db4a3a5b01d
removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
author | alex |
---|---|
date | Wed, 28 Apr 2004 10:18:33 +0000 |
parents | 14fa6a121a47 |
children | 601e2c8a2922 |
line wrap: on
line diff
--- a/libmpdemux/stheader.h Wed Apr 28 05:58:46 2004 +0000 +++ b/libmpdemux/stheader.h Wed Apr 28 10:18:33 2004 +0000 @@ -1,43 +1,8 @@ #ifndef __ST_HEADER_H #define __ST_HEADER_H 1 -// for AVIStreamHeader: -#include "wine/avifmt.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 +#include "aviheader.h" +#include "ms_hdr.h" // Stream headers: