Mercurial > mplayer.hg

diff mplayer.c @ 2036:029bad24d022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
baz.. fixed wrong cvs merge.
author atmos4
date Mon, 01 Oct 2001 17:25:07 +0000
parents 2f1974590f88
children c34a29902845
line wrap: on
line diff
--- a/mplayer.c	Mon Oct 01 17:23:44 2001 +0000
+++ b/mplayer.c	Mon Oct 01 17:25:07 2001 +0000
@@ -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"
@@ -75,6 +70,10 @@
 #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;