Index: libvo/aclib.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aclib.c,v retrieving revision 1.12 diff -u -r1.12 aclib.c --- libvo/aclib.c 25 Jun 2004 16:58:45 -0000 1.12 +++ libvo/aclib.c 25 Sep 2004 15:09:13 -0000 @@ -8,7 +8,7 @@ runtime cpu detection by michael niedermayer (michaelni@gmx.at) is under GPL */ #include -#include "../cpudetect.h" +#include "cpudetect.h" #include "fastmemcpy.h" #undef memcpy Index: libvo/aspect.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aspect.c,v retrieving revision 1.16 diff -u -r1.16 aspect.c --- libvo/aspect.c 15 Oct 2003 15:17:09 -0000 1.16 +++ libvo/aspect.c 25 Sep 2004 15:09:13 -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 Index: libvo/fastmemcpy.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/fastmemcpy.h,v retrieving revision 1.20 diff -u -r1.20 fastmemcpy.h --- libvo/fastmemcpy.h 25 Jun 2004 18:20:45 -0000 1.20 +++ libvo/fastmemcpy.h 25 Sep 2004 15:09:13 -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) \ Index: libvo/font_load_ft.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v retrieving revision 1.13 diff -u -r1.13 font_load_ft.c --- libvo/font_load_ft.c 8 Dec 2003 13:30:30 -0000 1.13 +++ libvo/font_load_ft.c 25 Sep 2004 15:09:13 -0000 @@ -28,10 +28,10 @@ #include #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) Index: libvo/geometry.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v retrieving revision 1.12 diff -u -r1.12 geometry.c --- libvo/geometry.c 24 Feb 2004 21:09:21 -0000 1.12 +++ libvo/geometry.c 25 Sep 2004 15:09:13 -0000 @@ -3,7 +3,7 @@ #include #include #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; Index: libvo/img_format.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/img_format.h,v retrieving revision 1.6 diff -u -r1.6 img_format.h --- libvo/img_format.h 13 Apr 2002 19:14:33 -0000 1.6 +++ libvo/img_format.h 25 Sep 2004 15:09:13 -0000 @@ -1,2 +1,2 @@ -#include "../libmpcodecs/img_format.h" +#include "libmpcodecs/img_format.h" Index: libvo/jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.21 diff -u -r1.21 jpeg_enc.c --- libvo/jpeg_enc.c 16 Feb 2004 14:41:42 -0000 1.21 +++ libvo/jpeg_enc.c 25 Sep 2004 15:09:13 -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" Index: libvo/mga_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v retrieving revision 1.59 diff -u -r1.59 mga_common.c --- libvo/mga_common.c 28 Jan 2004 10:03:40 -0000 1.59 +++ libvo/mga_common.c 25 Sep 2004 15:09:13 -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 Index: libvo/osd.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/osd.c,v retrieving revision 1.22 diff -u -r1.22 osd.c --- libvo/osd.c 31 May 2004 15:09:44 -0000 1.22 +++ libvo/osd.c 25 Sep 2004 15:09:13 -0000 @@ -9,8 +9,8 @@ #include "osd.h" #include "mp_msg.h" #include -#include "../cpudetect.h" -#include "../mangle.h" +#include "cpudetect.h" +#include "mangle.h" extern int verbose; // defined in mplayer.c Index: libvo/sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.75 diff -u -r1.75 sub.c --- libvo/sub.c 15 Sep 2004 13:16:52 -0000 1.75 +++ libvo/sub.c 25 Sep 2004 15:09:13 -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 Index: libvo/sub.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.h,v retrieving revision 1.28 diff -u -r1.28 sub.h --- libvo/sub.h 4 Oct 2003 17:29:04 -0000 1.28 +++ libvo/sub.h 25 Sep 2004 15:09:13 -0000 @@ -56,7 +56,7 @@ #else -#include "../subreader.h" +#include "subreader.h" extern unsigned char* vo_osd_text; Index: libvo/vesa_lvo.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vesa_lvo.c,v retrieving revision 1.17 diff -u -r1.17 vesa_lvo.c --- libvo/vesa_lvo.c 26 Jul 2002 12:42:43 -0000 1.17 +++ libvo/vesa_lvo.c 25 Sep 2004 15:09:13 -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" Index: libvo/video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.90 diff -u -r1.90 video_out.c --- libvo/video_out.c 20 Sep 2004 01:35:43 -0000 1.90 +++ libvo/video_out.c 25 Sep 2004 15:09:13 -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; Index: libvo/video_out.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v retrieving revision 1.58 diff -u -r1.58 video_out.h --- libvo/video_out.h 22 Aug 2004 19:01:56 -0000 1.58 +++ libvo/video_out.h 25 Sep 2004 15:09:13 -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 Index: libvo/video_out_internal.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v retrieving revision 1.14 diff -u -r1.14 video_out_internal.h --- libvo/video_out_internal.h 11 Nov 2002 15:20:25 -0000 1.14 +++ libvo/video_out_internal.h 25 Sep 2004 15:09:13 -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, ...); Index: libvo/vo_aa.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v retrieving revision 1.43 diff -u -r1.43 vo_aa.c --- libvo/vo_aa.c 13 Aug 2003 16:45:02 -0000 1.43 +++ libvo/vo_aa.c 25 Sep 2004 15:09:13 -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" Index: libvo/vo_bl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_bl.c,v retrieving revision 1.7 diff -u -r1.7 vo_bl.c --- libvo/vo_bl.c 11 Aug 2004 13:39:32 -0000 1.7 +++ libvo/vo_bl.c 25 Sep 2004 15:09:13 -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 = Index: libvo/vo_cvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_cvidix.c,v retrieving revision 1.11 diff -u -r1.11 vo_cvidix.c --- libvo/vo_cvidix.c 17 Sep 2004 09:56:09 -0000 1.11 +++ libvo/vo_cvidix.c 25 Sep 2004 15:09:13 -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 = { Index: libvo/vo_dfbmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v retrieving revision 1.22 diff -u -r1.22 vo_dfbmga.c --- libvo/vo_dfbmga.c 25 Sep 2004 13:46:21 -0000 1.22 +++ libvo/vo_dfbmga.c 25 Sep 2004 15:09:13 -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 ) Index: libvo/vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.69 diff -u -r1.69 vo_dga.c --- libvo/vo_dga.c 14 Jun 2004 04:53:02 -0000 1.69 +++ libvo/vo_dga.c 25 Sep 2004 15:09:13 -0000 @@ -21,7 +21,7 @@ #include "aspect.h" #include "x11_common.h" #include "fastmemcpy.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include #include Index: libvo/vo_directfb.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v retrieving revision 1.28 diff -u -r1.28 vo_directfb.c --- libvo/vo_directfb.c 4 Oct 2003 17:29:04 -0000 1.28 +++ libvo/vo_directfb.c 25 Sep 2004 15:09:13 -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) { Index: libvo/vo_directfb2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v retrieving revision 1.16 diff -u -r1.16 vo_directfb2.c --- libvo/vo_directfb2.c 21 Feb 2004 08:21:42 -0000 1.16 +++ libvo/vo_directfb2.c 25 Sep 2004 15:09:13 -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) { Index: libvo/vo_directx.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v retrieving revision 1.38 diff -u -r1.38 vo_directx.c --- libvo/vo_directx.c 22 Sep 2004 16:26:53 -0000 1.38 +++ libvo/vo_directx.c 25 Sep 2004 15:09:13 -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" Index: libvo/vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.121 diff -u -r1.121 vo_dxr3.c --- libvo/vo_dxr3.c 20 Aug 2004 09:41:13 -0000 1.121 +++ libvo/vo_dxr3.c 25 Sep 2004 15:09:13 -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" Index: libvo/vo_ggi.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v retrieving revision 1.30 diff -u -r1.30 vo_ggi.c --- libvo/vo_ggi.c 25 Jun 2004 16:58:45 -0000 1.30 +++ libvo/vo_ggi.c 25 Sep 2004 15:09:13 -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) Index: libvo/vo_gl2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v retrieving revision 1.51 diff -u -r1.51 vo_gl2.c --- libvo/vo_gl2.c 25 Jul 2004 12:49:01 -0000 1.51 +++ libvo/vo_gl2.c 25 Sep 2004 15:09:13 -0000 @@ -17,7 +17,7 @@ #include "sub.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif #include Index: libvo/vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.23 diff -u -r1.23 vo_quartz.c --- libvo/vo_quartz.c 24 Aug 2004 20:42:27 -0000 1.23 +++ libvo/vo_quartz.c 25 Sep 2004 15:09:13 -0000 @@ -34,8 +34,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" @@ -105,7 +105,7 @@ static Rect oldWinRect; // size of the window containg the displayed image (include padding) when NOT in FS mode static Rect deviceRect; // size of the display device -#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)); Index: libvo/vo_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v retrieving revision 1.116 diff -u -r1.116 vo_sdl.c --- libvo/vo_sdl.c 9 Jul 2004 18:59:55 -0000 1.116 +++ libvo/vo_sdl.c 25 Sep 2004 15:09:13 -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)) Index: libvo/vo_svga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v retrieving revision 1.74 diff -u -r1.74 vo_svga.c --- libvo/vo_svga.c 7 Dec 2003 15:08:20 -0000 1.74 +++ libvo/vo_svga.c 25 Sep 2004 15:09:13 -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 Index: libvo/vo_vesa.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v retrieving revision 1.101 diff -u -r1.101 vo_vesa.c --- libvo/vo_vesa.c 1 Aug 2004 11:17:27 -0000 1.101 +++ libvo/vo_vesa.c 25 Sep 2004 15:09:13 -0000 @@ -44,8 +44,8 @@ #include "vosub_vidix.h" #endif -#include "../postproc/swscale.h" -#include "../libmpcodecs/vf_scale.h" +#include "postproc/swscale.h" +#include "libmpcodecs/vf_scale.h" #ifdef HAVE_PNG Index: libvo/vo_winvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_winvidix.c,v retrieving revision 1.4 diff -u -r1.4 vo_winvidix.c --- libvo/vo_winvidix.c 19 Jul 2004 23:19:50 -0000 1.4 +++ libvo/vo_winvidix.c 25 Sep 2004 15:09:13 -0000 @@ -17,14 +17,14 @@ #include "video_out_internal.h" #include -#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); Index: libvo/vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.140 diff -u -r1.140 vo_x11.c --- libvo/vo_x11.c 20 Aug 2004 09:41:13 -0000 1.140 +++ libvo/vo_x11.c 25 Sep 2004 15:09:13 -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 = { Index: libvo/vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.89 diff -u -r1.89 vo_xmga.c --- libvo/vo_xmga.c 20 Aug 2004 09:41:13 -0000 1.89 +++ libvo/vo_xmga.c 25 Sep 2004 15:09:13 -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 = { Index: libvo/vo_xover.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v retrieving revision 1.9 diff -u -r1.9 vo_xover.c --- libvo/vo_xover.c 20 Aug 2004 09:41:13 -0000 1.9 +++ libvo/vo_xover.c 25 Sep 2004 15:09:13 -0000 @@ -34,7 +34,7 @@ #include "mp_msg.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif Index: libvo/vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.155 diff -u -r1.155 vo_xv.c --- libvo/vo_xv.c 3 Sep 2004 20:22:22 -0000 1.155 +++ libvo/vo_xv.c 25 Sep 2004 15:09:13 -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 = { Index: libvo/vo_xvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v retrieving revision 1.69 diff -u -r1.69 vo_xvidix.c --- libvo/vo_xvidix.c 20 Aug 2004 09:41:13 -0000 1.69 +++ libvo/vo_xvidix.c 25 Sep 2004 15:09:13 -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 Index: libvo/vo_xvmc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v retrieving revision 1.12 diff -u -r1.12 vo_xvmc.c --- libvo/vo_xvmc.c 23 Aug 2004 09:52:25 -0000 1.12 +++ libvo/vo_xvmc.c 25 Sep 2004 15:09:13 -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 Index: libvo/vo_yuv4mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_yuv4mpeg.c,v retrieving revision 1.15 diff -u -r1.15 vo_yuv4mpeg.c --- libvo/vo_yuv4mpeg.c 2 Sep 2003 17:40:41 -0000 1.15 +++ libvo/vo_yuv4mpeg.c 25 Sep 2004 15:09:13 -0000 @@ -35,8 +35,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 = { Index: libvo/vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.28 diff -u -r1.28 vo_zr.c --- libvo/vo_zr.c 3 Nov 2003 17:38:50 -0000 1.28 +++ libvo/vo_zr.c 25 Sep 2004 15:09:13 -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" Index: libvo/vo_zr2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr2.c,v retrieving revision 1.4 diff -u -r1.4 vo_zr2.c --- libvo/vo_zr2.c 19 Dec 2003 22:04:13 -0000 1.4 +++ libvo/vo_zr2.c 25 Sep 2004 15:09:13 -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 = { Index: libvo/vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.63 diff -u -r1.63 vosub_vidix.c --- libvo/vosub_vidix.c 28 Jan 2004 10:03:40 -0000 1.63 +++ libvo/vosub_vidix.c 25 Sep 2004 15:09:13 -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 */ Index: libvo/vosub_vidix.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v retrieving revision 1.11 diff -u -r1.11 vosub_vidix.h --- libvo/vosub_vidix.h 7 Nov 2003 15:12:29 -0000 1.11 +++ libvo/vosub_vidix.h 25 Sep 2004 15:09:13 -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); Index: libvo/w32_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/w32_common.c,v retrieving revision 1.6 diff -u -r1.6 w32_common.c --- libvo/w32_common.c 2 Aug 2004 15:02:35 -0000 1.6 +++ libvo/w32_common.c 25 Sep 2004 15:09:13 -0000 @@ -1,10 +1,10 @@ #include #include -#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" Index: libvo/x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.176 diff -u -r1.176 x11_common.c --- libvo/x11_common.c 8 Aug 2004 23:22:04 -0000 1.176 +++ libvo/x11_common.c 25 Sep 2004 15:09:13 -0000 @@ -20,7 +20,7 @@ #include "aspect.h" #include "geometry.h" #include "help_mp.h" -#include "../osdep/timer.h" +#include "osdep/timer.h" #include #include @@ -45,12 +45,12 @@ #include #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);