Mercurial > mplayer.hg
changeset 2036:029bad24d022
baz.. fixed wrong cvs merge.
| author | atmos4 |
|---|---|
| date | Mon, 01 Oct 2001 17:25:07 +0000 |
| parents | 0c04c2b4f9e7 |
| children | 11cae7a32291 |
| files | mplayer.c |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
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;