RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

baz.. fixed wrong cvs merge. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2037 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2001-10-01 17:25:07 +00:00
parent 1b7753370d
commit 7dc1b569dc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mplayer.c
View File

@ -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;