summaryrefslogtreecommitdiffstats
path: root/Gui/interface.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-12-08 22:12:57 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-12-08 22:12:57 +0000
commit1fd91df1ea9c0574c9fdbfb0684011411a0e8486 (patch)
treecf20adcfd7cd0a0e45ca95d244523f9082034d05 /Gui/interface.c
parente26849cee04b7be6e65d18f4fc93c407ca75b946 (diff)
downloadmpv-1fd91df1ea9c0574c9fdbfb0684011411a0e8486.tar.bz2
mpv-1fd91df1ea9c0574c9fdbfb0684011411a0e8486.tar.xz
Unify include paths, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17145 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r--Gui/interface.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/Gui/interface.c b/Gui/interface.c
index 58e85c4687..3e03e2a1ca 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -15,20 +15,20 @@
#include "mplayer/mplayer.h"
#include "mplayer/play.h"
-#include "../mplayer.h"
+#include "mplayer.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"
-#include "../libvo/sub.h"
-#include "../input/input.h"
-#include "../libao2/audio_out.h"
-#include "../mixer.h"
-#include "../libaf/af.h"
-#include "../libaf/equalizer.h"
+#include "help_mp.h"
+#include "subreader.h"
+#include "libvo/x11_common.h"
+#include "libvo/video_out.h"
+#include "libvo/font_load.h"
+#include "libvo/sub.h"
+#include "input/input.h"
+#include "libao2/audio_out.h"
+#include "mixer.h"
+#include "libaf/af.h"
+#include "libaf/equalizer.h"
extern af_cfg_t af_cfg;
@@ -36,13 +36,13 @@ extern af_cfg_t af_cfg;
#include <iconv.h>
#endif
-#include "../libmpdemux/stream.h"
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
-#include "../libmpcodecs/dec_video.h"
+#include "libmpdemux/stream.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "libmpcodecs/dec_video.h"
-#include "../m_config.h"
-#include "../m_option.h"
+#include "m_config.h"
+#include "m_option.h"
extern mixer_t mixer; // mixer from mplayer.c
@@ -1195,7 +1195,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
#define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
-#include "../playtree.h"
+#include "playtree.h"
//This function adds/inserts one file into the gui playlist