diff options
Diffstat (limited to 'libmpdemux/stheader.h')
-rw-r--r-- | libmpdemux/stheader.h | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 79a687d216..1de8715b50 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -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: |