Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
2035:0c04c2b4f9e7 2036:029bad24d022
42 42
43 //#ifdef USE_OSD 43 //#ifdef USE_OSD
44 #include "libvo/sub.h" 44 #include "libvo/sub.h"
45 //#endif 45 //#endif
46 46
47 #ifdef HAVE_NEW_GUI
48 #define COMPILE_GMPLAYER
49 #include "Gui/mplayer/play.h"
50 #endif
51
52 #include "libao2/audio_out.h" 47 #include "libao2/audio_out.h"
53 48
54 #include "libmpeg2/mpeg2.h" 49 #include "libmpeg2/mpeg2.h"
55 #include "libmpeg2/mpeg2_internal.h" 50 #include "libmpeg2/mpeg2_internal.h"
56 51
71 #include "linux/timer.h" 66 #include "linux/timer.h"
72 #include "linux/shmem.h" 67 #include "linux/shmem.h"
73 68
74 #ifdef HAVE_LIRC 69 #ifdef HAVE_LIRC
75 #include "lirc_mp.h" 70 #include "lirc_mp.h"
71 #endif
72
73 #ifdef HAVE_NEW_GUI
74 #include "Gui/mplayer/play.h"
76 #endif 75 #endif
77 76
78 #define DEBUG if(0) 77 #define DEBUG if(0)
79 int verbose=0; 78 int verbose=0;
80 int quiet=0; 79 int quiet=0;