# HG changeset patch
# User diego
# Date 1098926153 0
# Node ID e047e70a9767e8e711f77987b726a8c5cbc0c521
# Parent  ad29267afe7a955b7f7934c6d354cefcee134e0d
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>.

diff -r ad29267afe7a -r e047e70a9767 Gui/Makefile
--- a/Gui/Makefile	Thu Oct 28 01:07:16 2004 +0000
+++ b/Gui/Makefile	Thu Oct 28 01:15:53 2004 +0000
@@ -4,7 +4,7 @@
 include ../config.mak
 include config.mak
 
-INCDIR  = -I. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) 
+INCDIR  = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) 
 
 OPTIMIZE =  $(OPTFLAGS) \
             -fexpensive-optimizations -fschedule-insns2 -Wall
diff -r ad29267afe7a -r e047e70a9767 Makefile
--- a/Makefile	Thu Oct 28 01:07:16 2004 +0000
+++ b/Makefile	Thu Oct 28 01:15:53 2004 +0000
@@ -35,7 +35,7 @@
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
 COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
 
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
 ifeq ($(TOOLAME),yes)
 CFLAGS += $(TOOLAME_EXTRAFLAGS) 
 CODEC_LIBS += $(TOOLAME_LIB)
diff -r ad29267afe7a -r e047e70a9767 libmpdemux/Makefile
--- a/libmpdemux/Makefile	Thu Oct 28 01:07:16 2004 +0000
+++ b/libmpdemux/Makefile	Thu Oct 28 01:15:53 2004 +0000
@@ -34,7 +34,7 @@
 
 OBJS	= $(SRCS:.c=.o)
 OBJS   += $(CPLUSPLUSSRCS:.cpp=.o)
-INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
+INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)
 CPLUSPLUSFLAGS  = $(CFLAGS) $(CPLUSPLUSINCLUDE)
 CPLUSPLUS = $(CC)
diff -r ad29267afe7a -r e047e70a9767 libvo/aclib.c
--- a/libvo/aclib.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/aclib.c	Thu Oct 28 01:15:53 2004 +0000
@@ -8,7 +8,7 @@
   runtime cpu detection by michael niedermayer (michaelni@gmx.at) is under GPL
 */
 #include <stddef.h>
-#include "../cpudetect.h"
+#include "cpudetect.h"
 #include "fastmemcpy.h"
 #undef memcpy
 
diff -r ad29267afe7a -r e047e70a9767 libvo/aspect.c
--- a/libvo/aspect.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/aspect.c	Thu Oct 28 01:15:53 2004 +0000
@@ -2,7 +2,7 @@
 #include "aspect.h"
 #include "geometry.h"
 #ifndef ASPECT_TEST
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #endif
 
 //#define ASPECT_DEBUG
diff -r ad29267afe7a -r e047e70a9767 libvo/fastmemcpy.h
--- a/libvo/fastmemcpy.h	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/fastmemcpy.h	Thu Oct 28 01:15:53 2004 +0000
@@ -1,7 +1,7 @@
 #ifndef __MPLAYER_MEMCPY
 #define __MPLAYER_MEMCPY 1
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_FASTMEMCPY
 #if defined(HAVE_MMX) || defined(HAVE_MMX2) || defined(HAVE_3DNOW) \
diff -r ad29267afe7a -r e047e70a9767 libvo/font_load_ft.c
--- a/libvo/font_load_ft.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/font_load_ft.c	Thu Oct 28 01:15:53 2004 +0000
@@ -28,10 +28,10 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
-#include "../bswap.h"
+#include "bswap.h"
 #include "font_load.h"
 #include "mp_msg.h"
-#include "../mplayer.h"
+#include "mplayer.h"
 #include "osd_font.h"
 
 #if (FREETYPE_MAJOR > 2) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1)
diff -r ad29267afe7a -r e047e70a9767 libvo/geometry.c
--- a/libvo/geometry.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/geometry.c	Thu Oct 28 01:15:53 2004 +0000
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "geometry.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
 char *vo_geometry = NULL;
diff -r ad29267afe7a -r e047e70a9767 libvo/img_format.h
--- a/libvo/img_format.h	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/img_format.h	Thu Oct 28 01:15:53 2004 +0000
@@ -1,2 +1,2 @@
 
-#include "../libmpcodecs/img_format.h"
+#include "libmpcodecs/img_format.h"
diff -r ad29267afe7a -r e047e70a9767 libvo/jpeg_enc.c
--- a/libvo/jpeg_enc.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/jpeg_enc.c	Thu Oct 28 01:15:53 2004 +0000
@@ -31,13 +31,13 @@
 #ifdef USE_FASTMEMCPY
 #include "fastmemcpy.h"
 #endif
-#include "../mp_msg.h"
+#include "mp_msg.h"
 /* We need this #define because we need ../libavcodec/common.h to #define 
  * be2me_32, otherwise the linker will complain that it doesn't exist */
 #define HAVE_AV_CONFIG_H
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
-#include "../libavcodec/mpegvideo.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 #include "jpeg_enc.h"
 
diff -r ad29267afe7a -r e047e70a9767 libvo/mga_common.c
--- a/libvo/mga_common.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/mga_common.c	Thu Oct 28 01:15:53 2004 +0000
@@ -1,9 +1,9 @@
 
 #include "fastmemcpy.h"
-#include "../cpudetect.h"
-#include "../postproc/swscale.h"
-#include "../postproc/rgb2rgb.h"
-#include "../libmpcodecs/vf_scale.h"
+#include "cpudetect.h"
+#include "postproc/swscale.h"
+#include "postproc/rgb2rgb.h"
+#include "libmpcodecs/vf_scale.h"
 #include "mp_msg.h"
 
 // mga_vid drawing functions
diff -r ad29267afe7a -r e047e70a9767 libvo/osd.c
--- a/libvo/osd.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/osd.c	Thu Oct 28 01:15:53 2004 +0000
@@ -9,8 +9,8 @@
 #include "osd.h"
 #include "mp_msg.h"
 #include <inttypes.h>
-#include "../cpudetect.h"
-#include "../mangle.h"
+#include "cpudetect.h"
+#include "mangle.h"
 
 extern int verbose; // defined in mplayer.c
 
diff -r ad29267afe7a -r e047e70a9767 libvo/sub.c
--- a/libvo/sub.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/sub.c	Thu Oct 28 01:15:53 2004 +0000
@@ -12,7 +12,7 @@
 #include "video_out.h"
 #include "font_load.h"
 #include "sub.h"
-#include "../spudec.h"
+#include "spudec.h"
 
 #define NEW_SPLITTING
 
diff -r ad29267afe7a -r e047e70a9767 libvo/sub.h
--- a/libvo/sub.h	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/sub.h	Thu Oct 28 01:15:53 2004 +0000
@@ -56,7 +56,7 @@
 
 #else
 
-#include "../subreader.h"
+#include "subreader.h"
 
 extern unsigned char* vo_osd_text;
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vesa_lvo.c
--- a/libvo/vesa_lvo.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vesa_lvo.c	Thu Oct 28 01:15:53 2004 +0000
@@ -23,7 +23,7 @@
 
 #include "vesa_lvo.h"
 #include "img_format.h"
-#include "../drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */
+#include "drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
diff -r ad29267afe7a -r e047e70a9767 libvo/video_out.c
--- a/libvo/video_out.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/video_out.c	Thu Oct 28 01:15:53 2004 +0000
@@ -15,7 +15,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 
 //int vo_flags=0;
 
diff -r ad29267afe7a -r e047e70a9767 libvo/video_out.h
--- a/libvo/video_out.h	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/video_out.h	Thu Oct 28 01:15:53 2004 +0000
@@ -15,7 +15,7 @@
 
 //#include "font_load.h"
 #include "img_format.h"
-//#include "../vidix/vidix.h"
+//#include "vidix/vidix.h"
 
 #define VO_EVENT_EXPOSE 1
 #define VO_EVENT_RESIZE 2
diff -r ad29267afe7a -r e047e70a9767 libvo/video_out_internal.h
--- a/libvo/video_out_internal.h	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/video_out_internal.h	Thu Oct 28 01:15:53 2004 +0000
@@ -22,8 +22,8 @@
  */
 
 /* All video drivers will want this */
-#include "../libmpcodecs/vfcap.h"
-#include "../libmpcodecs/mp_image.h"
+#include "libmpcodecs/vfcap.h"
+#include "libmpcodecs/mp_image.h"
 #include "geometry.h"
 
 static uint32_t control(uint32_t request, void *data, ...);
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_aa.c
--- a/libvo/vo_aa.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_aa.c	Thu Oct 28 01:15:53 2004 +0000
@@ -27,8 +27,8 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "aspect.h"
-#include "../postproc/swscale.h"
-#include "../libmpcodecs/vf_scale.h"
+#include "postproc/swscale.h"
+#include "libmpcodecs/vf_scale.h"
 #include "font_load.h"
 #include "sub.h"
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_bl.c
--- a/libvo/vo_bl.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_bl.c	Thu Oct 28 01:15:53 2004 +0000
@@ -43,8 +43,8 @@
 
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "../mp_msg.h"
-#include "../m_option.h"
+#include "mp_msg.h"
+#include "m_option.h"
 #include "fastmemcpy.h"
 
 static vo_info_t info = 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_cvidix.c
--- a/libvo/vo_cvidix.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_cvidix.c	Thu Oct 28 01:15:53 2004 +0000
@@ -23,7 +23,7 @@
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "../vidix/vidixlib.h"
+#include "vidix/vidixlib.h"
 
 
 static vo_info_t info = {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_dfbmga.c
--- a/libvo/vo_dfbmga.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_dfbmga.c	Thu Oct 28 01:15:53 2004 +0000
@@ -1339,7 +1339,7 @@
 
 extern void mplayer_put_key( int code );
 
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 
 static void
 check_events( void )
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_dga.c
--- a/libvo/vo_dga.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_dga.c	Thu Oct 28 01:15:53 2004 +0000
@@ -21,7 +21,7 @@
 #include "aspect.h"
 #include "x11_common.h"
 #include "fastmemcpy.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/xf86dga.h>
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_directfb.c
--- a/libvo/vo_directfb.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_directfb.c	Thu Oct 28 01:15:53 2004 +0000
@@ -57,7 +57,7 @@
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
 #include "sub.h"
-#include "../postproc/rgb2rgb.h"
+#include "postproc/rgb2rgb.h"
 
 #include "aspect.h"
 
@@ -1411,7 +1411,7 @@
 
 extern void mplayer_put_key(int code);
 
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 
 static void check_events(void)
 {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_directfb2.c
--- a/libvo/vo_directfb2.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_directfb2.c	Thu Oct 28 01:15:53 2004 +0000
@@ -933,7 +933,7 @@
 
 extern void mplayer_put_key(int code);
 
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 
 static void check_events(void)
 {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_directx.c
--- a/libvo/vo_directx.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_directx.c	Thu Oct 28 01:15:53 2004 +0000
@@ -28,10 +28,10 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "fastmemcpy.h"
-#include "../input/input.h"
-#include "../osdep/keycodes.h"
-#include "../input/mouse.h"
-#include "../mp_msg.h"
+#include "input/input.h"
+#include "osdep/keycodes.h"
+#include "input/mouse.h"
+#include "mp_msg.h"
 #include "aspect.h"
 #include "geometry.h"
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_dxr3.c
--- a/libvo/vo_dxr3.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_dxr3.c	Thu Oct 28 01:15:53 2004 +0000
@@ -141,7 +141,7 @@
 #include "spuenc.h"
 #include "sub.h"
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 #ifdef HAVE_X11
 #include "x11_common.h"
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_ggi.c
--- a/libvo/vo_ggi.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_ggi.c	Thu Oct 28 01:15:53 2004 +0000
@@ -533,7 +533,7 @@
 }
 
 /* EVENT handling */
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 extern void mplayer_put_key(int code);
 
 static void check_events(void)
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_gl2.c
--- a/libvo/vo_gl2.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_gl2.c	Thu Oct 28 01:15:53 2004 +0000
@@ -17,7 +17,7 @@
 #include "sub.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 
 #include <GL/gl.h>
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_quartz.c
--- a/libvo/vo_quartz.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_quartz.c	Thu Oct 28 01:15:53 2004 +0000
@@ -31,8 +31,8 @@
 #include "mp_msg.h"
 #include "m_option.h"
 
-#include "../input/input.h"
-#include "../input/mouse.h"
+#include "input/input.h"
+#include "input/mouse.h"
 
 #include "vo_quartz.h"
 
@@ -112,7 +112,7 @@
 	kFullScreenCmd		= 5
 };
 
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 extern void mplayer_put_key(int code);
 
 extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_sdl.c
--- a/libvo/vo_sdl.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_sdl.c	Thu Oct 28 01:15:53 2004 +0000
@@ -119,8 +119,8 @@
 #include "x11_common.h"
 #endif
 
-#include "../input/input.h"
-#include "../input/mouse.h"
+#include "input/input.h"
+#include "input/mouse.h"
 
 extern int verbose;
 int sdl_noxv;
@@ -1165,7 +1165,7 @@
  *  returns : doesn't return
  **/
 
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 extern void mplayer_put_key(int code);
 
 #define shift_key (event.key.keysym.mod==(KMOD_LSHIFT||KMOD_RSHIFT)) 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_svga.c
--- a/libvo/vo_svga.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_svga.c	Thu Oct 28 01:15:53 2004 +0000
@@ -44,8 +44,8 @@
 
 #include "sub.h"
 
-#include "../mp_msg.h"
-//#include "../mp_image.h"
+#include "mp_msg.h"
+//#include "mp_image.h"
 
 #include <assert.h>
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_winvidix.c
--- a/libvo/vo_winvidix.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_winvidix.c	Thu Oct 28 01:15:53 2004 +0000
@@ -17,14 +17,14 @@
 #include "video_out_internal.h"
 
 #include <windows.h>
-#include "../osdep/keycodes.h"
-#include "../input/input.h"
+#include "osdep/keycodes.h"
+#include "input/input.h"
 
 #include "aspect.h"
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "../vidix/vidixlib.h"
+#include "vidix/vidixlib.h"
 
 extern void mplayer_put_key(int code);
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_x11.c	Thu Oct 28 01:15:53 2004 +0000
@@ -38,16 +38,16 @@
 #include "fastmemcpy.h"
 #include "sub.h"
 
-#include "../postproc/swscale.h"
-#include "../postproc/swscale_internal.h"       //FIXME
-#include "../postproc/rgb2rgb.h"
-#include "../libmpcodecs/vf_scale.h"
+#include "postproc/swscale.h"
+#include "postproc/swscale_internal.h"       //FIXME
+#include "postproc/rgb2rgb.h"
+#include "libmpcodecs/vf_scale.h"
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
-#include "../mplayer.h"
+#include "Gui/interface.h"
+#include "mplayer.h"
 #endif
 
 static vo_info_t info = {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_xmga.c
--- a/libvo/vo_xmga.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_xmga.c	Thu Oct 28 01:15:53 2004 +0000
@@ -38,13 +38,13 @@
 #include "aspect.h"
 
 #ifdef SHOW_TIME
-#include "../osdep/timer.h"
+#include "osdep/timer.h"
 static unsigned int timer = 0;
 static unsigned int timerd = 0;
 #endif
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 
 static vo_info_t info = {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_xover.c
--- a/libvo/vo_xover.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_xover.c	Thu Oct 28 01:15:53 2004 +0000
@@ -34,7 +34,7 @@
 #include "mp_msg.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_xv.c
--- a/libvo/vo_xv.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_xv.c	Thu Oct 28 01:15:53 2004 +0000
@@ -37,7 +37,7 @@
 #include "aspect.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 
 static vo_info_t info = {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_xvidix.c
--- a/libvo/vo_xvidix.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_xvidix.c	Thu Oct 28 01:15:53 2004 +0000
@@ -31,10 +31,10 @@
 #include "mp_msg.h"
 
 #include "vosub_vidix.h"
-#include "../vidix/vidixlib.h"
+#include "vidix/vidixlib.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_xvmc.c
--- a/libvo/vo_xvmc.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_xvmc.c	Thu Oct 28 01:15:53 2004 +0000
@@ -31,7 +31,7 @@
 #include "aspect.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
+#include "Gui/interface.h"
 #endif
 
 //no chanse xinerama to be suported in near future
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_yuv4mpeg.c
--- a/libvo/vo_yuv4mpeg.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_yuv4mpeg.c	Thu Oct 28 01:15:53 2004 +0000
@@ -38,8 +38,8 @@
 #include "sub.h"
 
 #include "fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
-#include "../libmpcodecs/vf_scale.h"
+#include "postproc/rgb2rgb.h"
+#include "libmpcodecs/vf_scale.h"
 
 static vo_info_t info = 
 {
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_zr.c
--- a/libvo/vo_zr.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_zr.c	Thu Oct 28 01:15:53 2004 +0000
@@ -24,8 +24,8 @@
 
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "../mp_msg.h"
-#include "../m_option.h"
+#include "mp_msg.h"
+#include "m_option.h"
 #include "fastmemcpy.h"
 
 #include "jpeg_enc.h"
diff -r ad29267afe7a -r e047e70a9767 libvo/vo_zr2.c
--- a/libvo/vo_zr2.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vo_zr2.c	Thu Oct 28 01:15:53 2004 +0000
@@ -25,7 +25,7 @@
 
 #include "video_out.h"
 #include "video_out_internal.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "fastmemcpy.h"
 
 static vo_info_t info = {
diff -r ad29267afe7a -r e047e70a9767 libvo/vosub_vidix.c
--- a/libvo/vosub_vidix.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vosub_vidix.c	Thu Oct 28 01:15:53 2004 +0000
@@ -26,14 +26,14 @@
 #include "config.h"
 
 #include "vosub_vidix.h"
-#include "../vidix/vidixlib.h"
+#include "vidix/vidixlib.h"
 #include "fastmemcpy.h"
 #include "osd.h"
 #include "video_out.h"
 #include "sub.h"
 
-#include "../libmpcodecs/vfcap.h"
-#include "../libmpcodecs/mp_image.h"
+#include "libmpcodecs/vfcap.h"
+#include "libmpcodecs/mp_image.h"
 
 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
 
diff -r ad29267afe7a -r e047e70a9767 libvo/vosub_vidix.h
--- a/libvo/vosub_vidix.h	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/vosub_vidix.h	Thu Oct 28 01:15:53 2004 +0000
@@ -29,7 +29,7 @@
 void     vidix_flip_page(void);
 void     vidix_draw_osd(void);
 
-#include "../vidix/vidix.h"
+#include "vidix/vidix.h"
 /* graphic keys */
 int vidix_grkey_support(void);
 int vidix_grkey_get(vidix_grkey_t *gr_key);
diff -r ad29267afe7a -r e047e70a9767 libvo/w32_common.c
--- a/libvo/w32_common.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/w32_common.c	Thu Oct 28 01:15:53 2004 +0000
@@ -1,10 +1,10 @@
 #include <limits.h>
 #include <windows.h>
 
-#include "../osdep/keycodes.h"
-#include "../input/input.h"
-#include "../input/mouse.h"
-#include "../mp_msg.h"
+#include "osdep/keycodes.h"
+#include "input/input.h"
+#include "input/mouse.h"
+#include "mp_msg.h"
 #include "video_out.h"
 #include "aspect.h"
 #include "w32_common.h"
diff -r ad29267afe7a -r e047e70a9767 libvo/x11_common.c
--- a/libvo/x11_common.c	Thu Oct 28 01:07:16 2004 +0000
+++ b/libvo/x11_common.c	Thu Oct 28 01:15:53 2004 +0000
@@ -20,7 +20,7 @@
 #include "aspect.h"
 #include "geometry.h"
 #include "help_mp.h"
-#include "../osdep/timer.h"
+#include "osdep/timer.h"
 
 #include <X11/Xmd.h>
 #include <X11/Xlib.h>
@@ -45,12 +45,12 @@
 #include <X11/extensions/Xvlib.h>
 #endif
 
-#include "../input/input.h"
-#include "../input/mouse.h"
+#include "input/input.h"
+#include "input/mouse.h"
 
 #ifdef HAVE_NEW_GUI
-#include "../Gui/interface.h"
-#include "../mplayer.h"
+#include "Gui/interface.h"
+#include "mplayer.h"
 #endif
 
 #define WIN_LAYER_ONBOTTOM               2
@@ -523,7 +523,7 @@
     mDisplay = NULL;
 }
 
-#include "../osdep/keycodes.h"
+#include "osdep/keycodes.h"
 #include "wskeys.h"
 
 extern void mplayer_put_key(int code);
diff -r ad29267afe7a -r e047e70a9767 mp3lib/Makefile
--- a/mp3lib/Makefile	Thu Oct 28 01:07:16 2004 +0000
+++ b/mp3lib/Makefile	Thu Oct 28 01:15:53 2004 +0000
@@ -7,7 +7,7 @@
 ifeq ($(TARGET_ARCH_SGI_MIPS),yes)
 OPTFLAGS := $(OPTFLAGS:-O4=-O0)
 endif
-CFLAGS  = $(OPTFLAGS) $(EXTRA_INC)
+CFLAGS  = -I.. $(OPTFLAGS) $(EXTRA_INC)
 ifeq ($(TARGET_ARCH_X86),yes)
 SRCS += decode_i586.c
 OBJS += decode_i586.o