summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gui/cfg.c4
-rw-r--r--gui/interface.c2
-rw-r--r--gui/mplayer/gtk/opts.c1
-rw-r--r--mplayer.h6
4 files changed, 4 insertions, 9 deletions
diff --git a/gui/cfg.c b/gui/cfg.c
index 1f7ef4bc7e..706a41ae87 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -10,8 +10,10 @@
#include "mplayer.h"
#include "m_config.h"
#include "m_option.h"
-
+#include "libvo/sub.h"
#include "libvo/video_out.h"
+#include "stream/stream.h"
+#include "libmpdemux/demuxer.h"
#include "cfg.h"
#include "app.h"
diff --git a/gui/interface.c b/gui/interface.c
index b4229e3994..c77ee2c0b3 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -15,12 +15,10 @@
#include "mplayer/gmplayer.h"
#include "mplayer/play.h"
-#include "mplayer.h"
#include "access_mpcontext.h"
#include "app.h"
#include "cfg.h"
#include "help_mp.h"
-#include "subreader.h"
#include "libvo/x11_common.h"
#include "libvo/video_out.h"
#include "libvo/font_load.h"
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 19bb3f2e9f..be1486c9ef 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -12,6 +12,7 @@
#include "help_mp.h"
#include "mixer.h"
#include "libao2/audio_out.h"
+#include "libvo/sub.h"
#include "libvo/video_out.h"
#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
diff --git a/mplayer.h b/mplayer.h
index 13b3bf27e8..90c2a53cd6 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -28,16 +28,10 @@ extern float force_fps;
extern float sub_delay;
extern float sub_fps;
extern int sub_auto;
-extern int sub_pos;
-extern int sub_unicode;
-extern char * sub_cp;
-extern int suboverlap_enabled;
extern char * filename;
extern int stream_cache_size;
-extern int force_ni;
-extern int index_mode;
extern int autosync;
// libmpcodecs: