[Mplayer-cvslog] CVS: main mplayer.c,1.287,1.288

[Atmosfear]

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

Modified Files:
	mplayer.c 
Log Message:
baz.. fixed wrong cvs merge.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- mplayer.c	1 Oct 2001 17:12:04 -0000	1.287
+++ mplayer.c	1 Oct 2001 17:25:07 -0000	1.288
@@ -44,11 +44,6 @@
 #include "libvo/sub.h"
 //#endif
 
-#ifdef HAVE_NEW_GUI
-#define COMPILE_GMPLAYER
-#include "Gui/mplayer/play.h"
-#endif
-
 #include "libao2/audio_out.h"
 
 #include "libmpeg2/mpeg2.h"
@@ -73,6 +68,10 @@
 
 #ifdef HAVE_LIRC
 #include "lirc_mp.h"
+#endif
+
+#ifdef HAVE_NEW_GUI
+#include "Gui/mplayer/play.h"
 #endif
 
 #define DEBUG if(0)