[Mplayer-cvslog] CVS: main mencoder.c,1.161,1.162

[Arpi of Ize]

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

Modified Files:
	mencoder.c 
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: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- mencoder.c	21 Sep 2002 12:41:29 -0000	1.161
+++ mencoder.c	22 Sep 2002 00:43:13 -0000	1.162
@@ -43,11 +43,15 @@
 
 #include "libvo/video_out.h"
 
+#include "libmpcodecs/mp_image.h"
 #include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/vf.h"
 
 #include "libmpdemux/mp3_hdr.h"
+
+// for MPEGLAYER3WAVEFORMAT:
+#include "loader/wine/mmreg.h"
 
 #ifdef HAVE_MP3LAME
 #undef CDECL