diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-01 17:25:07 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-01 17:25:07 +0000 |
| commit | 7dc1b569dcde0989b7879b34098a66cf041245bc (patch) | |
| tree | f2e97c78254b55db3b7aa5f4532745e98eaf060d /mplayer.c | |
| parent | 1b7753370d4ec70f125961884155c34c1aed2e28 (diff) | |
| download | mpv-7dc1b569dcde0989b7879b34098a66cf041245bc.tar.bz2 mpv-7dc1b569dcde0989b7879b34098a66cf041245bc.tar.xz | |
baz.. fixed wrong cvs merge.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2037 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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; |