diff options
-rw-r--r-- | command.c | 16 | ||||
-rw-r--r-- | mencoder.c | 7 | ||||
-rw-r--r-- | mp_msg.c | 5 | ||||
-rw-r--r-- | mpcommon.c | 2 | ||||
-rw-r--r-- | mplayer.c | 14 | ||||
-rw-r--r-- | vobsub.c | 2 |
6 files changed, 2 insertions, 44 deletions
@@ -28,35 +28,19 @@ #include "vobsub.h" #include "spudec.h" #include "get_path.h" -#ifdef CONFIG_TV #include "stream/tv.h" -#endif -#ifdef CONFIG_RADIO #include "stream/stream_radio.h" -#endif -#ifdef CONFIG_PVR #include "stream/pvr.h" -#endif #ifdef CONFIG_DVBIN #include "stream/dvbin.h" #endif -#ifdef CONFIG_DVDREAD #include "stream/stream_dvd.h" -#endif -#ifdef CONFIG_DVDNAV #include "stream/stream_dvdnav.h" -#endif -#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" -#endif -#ifdef CONFIG_MENU #include "m_struct.h" #include "libmenu/menu.h" -#endif -#ifdef CONFIG_GUI #include "gui/interface.h" -#endif #include "mp_core.h" #include "mp_fifo.h" diff --git a/mencoder.c b/mencoder.c index d082ecd141..9129df7c9a 100644 --- a/mencoder.c +++ b/mencoder.c @@ -77,13 +77,8 @@ #include "stream/stream_dvd.h" #endif -#ifdef CONFIG_DVDNAV #include "stream/stream_dvdnav.h" -#endif - -#ifdef CONFIG_LIBAVCODEC #include "libavcodec/avcodec.h" -#endif #include "libmpcodecs/ae.h" int vo_doublebuffering=0; @@ -218,10 +213,8 @@ void mplayer_put_key(int code) { } -#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" -#endif char *current_module; #include "mpcommon.h" @@ -21,11 +21,10 @@ char* get_term_charset(void); #if defined(FOR_MENCODER) #undef CONFIG_GUI int use_gui; -#endif - -#ifdef CONFIG_GUI +#else #include "gui/interface.h" #endif + #include "mp_msg.h" /* maximum message length of mp_msg */ diff --git a/mpcommon.c b/mpcommon.c index 248e609151..ba738dcee4 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -11,9 +11,7 @@ #include "spudec.h" #include "version.h" #include "vobsub.h" -#ifdef CONFIG_TV_TELETEXT #include "stream/tv.h" -#endif #include "libavutil/intreadwrite.h" #include "m_option.h" @@ -72,9 +72,7 @@ #include "osdep/getch2.h" #include "osdep/timer.h" -#ifdef CONFIG_GUI #include "gui/interface.h" -#endif #include "input/input.h" @@ -100,17 +98,10 @@ char *heartbeat_cmd; #endif /* __linux__ */ #endif /* HAVE_RTC */ -#ifdef CONFIG_TV #include "stream/tv.h" -#endif -#ifdef CONFIG_RADIO #include "stream/stream_radio.h" -#endif - -#ifdef CONFIG_DVBIN #include "stream/dvbin.h" #include "stream/cache2.h" -#endif //**************************************************************************// // Playtree @@ -161,10 +152,7 @@ static int max_framesize=0; #ifdef CONFIG_DVDREAD #include "stream/stream_dvd.h" #endif - -#ifdef CONFIG_DVDNAV #include "stream/stream_dvdnav.h" -#endif #include "libmpcodecs/dec_audio.h" #include "libmpcodecs/dec_video.h" @@ -320,10 +308,8 @@ char *vobsub_name=NULL; int subcc_enabled=0; int suboverlap_enabled = 1; -#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" -#endif char* current_module=NULL; // for debugging @@ -20,9 +20,7 @@ #include "vobsub.h" #include "spudec.h" #include "mp_msg.h" -#ifdef CONFIG_UNRAR_EXEC #include "unrar_exec.h" -#endif #include "libavutil/common.h" extern int vobsub_id; |