removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12342 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 78 insertions, 0 deletions

diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
new file mode 100644
index 0000000000..9af3e7d765
--- /dev/null
+++ b/libmpdemux/ms_hdr.h
@@ -0,0 +1,78 @@
+#ifndef __MS_HEADER_H
+#define __MS_HEADER_H 1
+
+#ifndef _WAVEFORMATEX_
+#define _WAVEFORMATEX_
+typedef struct __attribute__((__packed__)) _WAVEFORMATEX {
+  unsigned short  wFormatTag;
+  unsigned short  nChannels;
+  unsigned int    nSamplesPerSec;
+  unsigned int    nAvgBytesPerSec;
+  unsigned short  nBlockAlign;
+  unsigned short  wBitsPerSample;
+  unsigned short  cbSize;
+} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
+#endif /* _WAVEFORMATEX_ */
+
+typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {
+  WAVEFORMATEX wf;
+  unsigned short wID;
+  unsigned int   fdwFlags;
+  unsigned short nBlockSize;
+  unsigned short nFramesPerBlock;
+  unsigned short nCodecDelay;
+} MPEGLAYER3WAVEFORMAT;
+
+#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H)
+#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
+
+#ifndef le2me_BITMAPINFOHEADER
+#ifdef WORDS_BIGENDIAN
+#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