summaryrefslogtreecommitdiffstats
path: root/demux/ms_hdr.h
diff options
context:
space:
mode:
Diffstat (limited to 'demux/ms_hdr.h')
-rw-r--r--demux/ms_hdr.h46
1 files changed, 0 insertions, 46 deletions
diff --git a/demux/ms_hdr.h b/demux/ms_hdr.h
index 7f837a58a4..5911d30730 100644
--- a/demux/ms_hdr.h
+++ b/demux/ms_hdr.h
@@ -54,18 +54,6 @@ typedef struct __attribute__((__packed__)) _WAVEFORMATEXTENSIBLE {
} WAVEFORMATEXTENSIBLE;
#endif /* _WAVEFORMATEXTENSIBLE_ */
-#ifndef _MPEGLAYER3WAVEFORMAT_
-#define _MPEGLAYER3WAVEFORMAT_
-typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
- WAVEFORMATEX wf;
- unsigned short wID;
- unsigned int fdwFlags;
- unsigned short nBlockSize;
- unsigned short nFramesPerBlock;
- unsigned short nCodecDelay;
-} MPEGLAYER3WAVEFORMAT;
-#endif /* _MPEGLAYER3WAVEFORMAT_ */
-
/* windows.h #includes wingdi.h on MinGW. */
#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_)
#define _BITMAPINFOHEADER_
@@ -83,40 +71,6 @@ typedef struct __attribute__((__packed__))
int biClrUsed;
int biClrImportant;
} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER;
-typedef struct {
- BITMAPINFOHEADER bmiHeader;
- int bmiColors[1];
-} BITMAPINFO, *LPBITMAPINFO;
-#endif
-
-#ifndef le2me_BITMAPINFOHEADER
-#if BYTE_ORDER == BIG_ENDIAN
-#define le2me_BITMAPINFOHEADER(h) { \
- (h)->biSize = le2me_32((h)->biSize); \
- (h)->biWidth = le2me_32((h)->biWidth); \
- (h)->biHeight = le2me_32((h)->biHeight); \
- (h)->biPlanes = le2me_16((h)->biPlanes); \
- (h)->biBitCount = le2me_16((h)->biBitCount); \
- (h)->biCompression = le2me_32((h)->biCompression); \
- (h)->biSizeImage = le2me_32((h)->biSizeImage); \
- (h)->biXPelsPerMeter = le2me_32((h)->biXPelsPerMeter); \
- (h)->biYPelsPerMeter = le2me_32((h)->biYPelsPerMeter); \
- (h)->biClrUsed = le2me_32((h)->biClrUsed); \
- (h)->biClrImportant = le2me_32((h)->biClrImportant); \
-}
-#define le2me_WAVEFORMATEX(h) { \
- (h)->wFormatTag = le2me_16((h)->wFormatTag); \
- (h)->nChannels = le2me_16((h)->nChannels); \
- (h)->nSamplesPerSec = le2me_32((h)->nSamplesPerSec); \
- (h)->nAvgBytesPerSec = le2me_32((h)->nAvgBytesPerSec); \
- (h)->nBlockAlign = le2me_16((h)->nBlockAlign); \
- (h)->wBitsPerSample = le2me_16((h)->wBitsPerSample); \
- (h)->cbSize = le2me_16((h)->cbSize); \
-}
-#else
-#define le2me_BITMAPINFOHEADER(h) /**/
-#define le2me_WAVEFORMATEX(h) /**/
-#endif
#endif
#endif /* MPLAYER_MS_HDR_H */