From 7dc1b569dcde0989b7879b34098a66cf041245bc Mon Sep 17 00:00:00 2001
From: atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 1 Oct 2001 17:25:07 +0000
Subject: [PATCH] baz.. fixed wrong cvs merge.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2037 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mplayer.c b/mplayer.c
index a8aa61f304..2d14ce0293 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -44,11 +44,6 @@ void* mDisplay; // Display* mDisplay;
 #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"
@@ -75,6 +70,10 @@ void* mDisplay; // Display* mDisplay;
 #include "lirc_mp.h"
 #endif
 
+#ifdef HAVE_NEW_GUI
+#include "Gui/mplayer/play.h"
+#endif
+
 #define DEBUG if(0)
 int verbose=0;
 int quiet=0;