diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-25 12:25:34 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-25 12:25:34 +0000 |
commit | 26691d09f87c56d36eb23133ffb1facec0993fd1 (patch) | |
tree | 7e685ae901e04c426328041d9edd563ef70182a1 | |
parent | 5dc65565ca302ef6623951158509f995341a6a2e (diff) | |
download | mpv-26691d09f87c56d36eb23133ffb1facec0993fd1.tar.bz2 mpv-26691d09f87c56d36eb23133ffb1facec0993fd1.tar.xz |
Remove redundant extern variable declarations, include proper headers instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24169 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | gui/cfg.c | 4 | ||||
-rw-r--r-- | gui/interface.c | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/opts.c | 1 | ||||
-rw-r--r-- | mplayer.h | 6 |
4 files changed, 4 insertions, 9 deletions
@@ -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" @@ -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: |