Mercurial > mplayer.hg
changeset 29429:2d14b0b53d8e
Remove pointless #ifdefs around harmless internal header #includes.
| author | diego |
|---|---|
| date | Sun, 02 Aug 2009 16:00:55 +0000 |
| parents | 2b12440cca99 |
| children | 2c33f492ff1f |
| files | command.c mencoder.c mp_msg.c mpcommon.c mplayer.c vobsub.c |
| diffstat | 6 files changed, 2 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/command.c Sun Aug 02 15:39:08 2009 +0000 +++ b/command.c Sun Aug 02 16:00:55 2009 +0000 @@ -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"
--- a/mencoder.c Sun Aug 02 15:39:08 2009 +0000 +++ b/mencoder.c Sun Aug 02 16:00:55 2009 +0000 @@ -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 @@ { } -#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" -#endif char *current_module; #include "mpcommon.h"
--- a/mp_msg.c Sun Aug 02 15:39:08 2009 +0000 +++ b/mp_msg.c Sun Aug 02 16:00:55 2009 +0000 @@ -21,11 +21,10 @@ #if defined(FOR_MENCODER) #undef CONFIG_GUI int use_gui; +#else +#include "gui/interface.h" #endif -#ifdef CONFIG_GUI -#include "gui/interface.h" -#endif #include "mp_msg.h" /* maximum message length of mp_msg */
--- a/mpcommon.c Sun Aug 02 15:39:08 2009 +0000 +++ b/mpcommon.c Sun Aug 02 16:00:55 2009 +0000 @@ -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"
--- a/mplayer.c Sun Aug 02 15:39:08 2009 +0000 +++ b/mplayer.c Sun Aug 02 16:00:55 2009 +0000 @@ -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 @@ #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 @@ #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 @@ 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