[Mplayer-cvslog] CVS: main/libmpdemux aviprint.c,1.14,1.15 stheader.h,1.32,1.33

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv22697/libmpdemux

Modified Files:
	aviprint.c stheader.h 
Log Message:
wine headers cleanup
- WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h
- lots of useless include wine/* removed from mplayer code
- fixed few warnings


Index: aviprint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviprint.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aviprint.c	28 Aug 2002 22:45:46 -0000	1.14
+++ aviprint.c	22 Sep 2002 00:43:14 -0000	1.15
@@ -5,6 +5,7 @@
 
 #include "config.h"
 
+// for avi_stream_id():
 #include "stream.h"
 #include "demuxer.h"
 

Index: stheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stheader.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- stheader.h	21 Sep 2002 23:23:03 -0000	1.32
+++ stheader.h	22 Sep 2002 00:43:14 -0000	1.33
@@ -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;