Mercurial > mplayer.hg
changeset 24149:35fcce39b121
Remove redundant extern variable declarations, include proper headers instead.
| author | diego |
|---|---|
| date | Sat, 25 Aug 2007 12:25:34 +0000 |
| parents | 0af335b90a68 |
| children | 2ae4c179ea25 |
| files | gui/cfg.c gui/interface.c gui/mplayer/gtk/opts.c mplayer.h |
| diffstat | 4 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/cfg.c Sat Aug 25 12:19:16 2007 +0000 +++ b/gui/cfg.c Sat Aug 25 12:25:34 2007 +0000 @@ -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"
--- a/gui/interface.c Sat Aug 25 12:19:16 2007 +0000 +++ b/gui/interface.c Sat Aug 25 12:25:34 2007 +0000 @@ -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"
--- a/gui/mplayer/gtk/opts.c Sat Aug 25 12:19:16 2007 +0000 +++ b/gui/mplayer/gtk/opts.c Sat Aug 25 12:25:34 2007 +0000 @@ -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"
--- a/mplayer.h Sat Aug 25 12:19:16 2007 +0000 +++ b/mplayer.h Sat Aug 25 12:25:34 2007 +0000 @@ -28,16 +28,10 @@ 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: