RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 21:27:08 +00:00
Code Issues Releases Wiki Activity

Remove pointless #ifdefs around harmless internal header #includes.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-08-02 16:00:55 +00:00
parent 19199c79ae
commit 64d5279410
6 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
command.c
View File

@ -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"

7
mencoder.c
View File

@ -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"

5
mp_msg.c
View File

@ -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 */

2
mpcommon.c
View File

@ -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"

14
mplayer.c
View File

@ -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

2
vobsub.c
View File

@ -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;