[Mplayer-cvslog] CVS: main codec-cfg.c, 1.109, 1.110 mencoder.c, 1.243, 1.244

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv11323

Modified Files:
	codec-cfg.c mencoder.c 
Log Message:
removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- codec-cfg.c	8 Jan 2004 18:02:31 -0000	1.109
+++ codec-cfg.c	28 Apr 2004 10:18:32 -0000	1.110
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 
 // for mmioFOURCC:
-#include "wine/avifmt.h"
+#include "libmpdemux/aviheader.h"
 
 #include "libvo/img_format.h"
 #include "codec-cfg.h"

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- mencoder.c	28 Apr 2004 04:29:17 -0000	1.243
+++ mencoder.c	28 Apr 2004 10:18:32 -0000	1.244
@@ -55,7 +55,7 @@
 #include "libmpcodecs/vf.h"
 
 // for MPEGLAYER3WAVEFORMAT:
-#include "loader/wine/mmreg.h"
+#include "libmpdemux/ms_hdr.h"
 
 #ifdef HAVE_MP3LAME
 #undef CDECL