Mercurial > mplayer.hg

changeset 17012:6ff3379a0862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify include path handling, -I.. is in CFLAGS.
author diego
date Fri, 18 Nov 2005 14:39:25 +0000
parents c29e74822d2c
children 3bfc7cbf4060
files libmpcodecs/ad_faad.c libmpcodecs/ad_hwac3.c libmpcodecs/ad_internal.h libmpcodecs/ad_liba52.c libmpcodecs/ad_mp3lib.c libmpcodecs/ad_mpc.c libmpcodecs/ad_pcm.c libmpcodecs/ad_qtaudio.c libmpcodecs/ad_realaud.c libmpcodecs/ad_twin.c libmpcodecs/ae.c libmpcodecs/ae_faac.c libmpcodecs/ae_lame.c libmpcodecs/ae_lavc.c libmpcodecs/ae_pcm.c libmpcodecs/ae_toolame.c libmpcodecs/ae_twolame.c libmpcodecs/dec_audio.c libmpcodecs/native/nuppelvideo.c libmpcodecs/vd_libmpeg2.c libmpcodecs/vd_qtvideo.c libmpcodecs/vd_realvid.c libmpcodecs/ve.c libmpcodecs/ve_divx4.c libmpcodecs/ve_lavc.c libmpcodecs/ve_libdv.c libmpcodecs/ve_nuv.c libmpcodecs/ve_qtvideo.c libmpcodecs/ve_raw.c libmpcodecs/ve_vfw.c libmpcodecs/ve_x264.c libmpcodecs/ve_xvid.c libmpcodecs/ve_xvid4.c libmpcodecs/vf.c libmpcodecs/vf_1bpp.c libmpcodecs/vf_2xsai.c libmpcodecs/vf_bmovl.c libmpcodecs/vf_boxblur.c libmpcodecs/vf_crop.c libmpcodecs/vf_cropdetect.c libmpcodecs/vf_decimate.c libmpcodecs/vf_delogo.c libmpcodecs/vf_denoise3d.c libmpcodecs/vf_detc.c libmpcodecs/vf_dint.c libmpcodecs/vf_divtc.c libmpcodecs/vf_down3dright.c libmpcodecs/vf_dsize.c libmpcodecs/vf_dvbscale.c libmpcodecs/vf_eq.c libmpcodecs/vf_expand.c libmpcodecs/vf_fame.c libmpcodecs/vf_field.c libmpcodecs/vf_fil.c libmpcodecs/vf_filmdint.c libmpcodecs/vf_flip.c libmpcodecs/vf_format.c libmpcodecs/vf_framestep.c libmpcodecs/vf_fspp.c libmpcodecs/vf_halfpack.c libmpcodecs/vf_harddup.c libmpcodecs/vf_hqdn3d.c libmpcodecs/vf_hue.c libmpcodecs/vf_il.c libmpcodecs/vf_ilpack.c libmpcodecs/vf_ivtc.c libmpcodecs/vf_kerndeint.c libmpcodecs/vf_lavc.c libmpcodecs/vf_lavcdeint.c libmpcodecs/vf_mirror.c libmpcodecs/vf_noformat.c libmpcodecs/vf_noise.c libmpcodecs/vf_palette.c libmpcodecs/vf_perspective.c libmpcodecs/vf_phase.c libmpcodecs/vf_pp.c libmpcodecs/vf_pp7.c libmpcodecs/vf_pullup.c libmpcodecs/vf_qp.c libmpcodecs/vf_rectangle.c libmpcodecs/vf_remove_logo.c libmpcodecs/vf_rgb2bgr.c libmpcodecs/vf_rgbtest.c libmpcodecs/vf_rotate.c libmpcodecs/vf_sab.c libmpcodecs/vf_scale.c libmpcodecs/vf_screenshot.c libmpcodecs/vf_smartblur.c libmpcodecs/vf_softpulldown.c libmpcodecs/vf_softskip.c libmpcodecs/vf_spp.c libmpcodecs/vf_swapuv.c libmpcodecs/vf_telecine.c libmpcodecs/vf_test.c libmpcodecs/vf_tfields.c libmpcodecs/vf_tile.c libmpcodecs/vf_tinterlace.c libmpcodecs/vf_unsharp.c libmpcodecs/vf_uspp.c libmpcodecs/vf_vo.c libmpcodecs/vf_yuvcsp.c libmpcodecs/vf_yuy2.c libmpcodecs/vf_yvu9.c libmpcodecs/vf_zrmjpeg.c libmpcodecs/vqf.h libmpdemux/cache2.c libmpdemux/cdda.c libmpdemux/cddb.c libmpdemux/cue_read.c libmpdemux/demux_asf.c libmpdemux/demux_audio.c libmpdemux/demux_mkv.c libmpdemux/demux_mov.c libmpdemux/demux_ogg.c libmpdemux/demux_rawaudio.c libmpdemux/demux_rawvideo.c libmpdemux/demux_ts.c libmpdemux/demux_ty.c libmpdemux/demux_ty_osd.c libmpdemux/demux_vqf.c libmpdemux/demux_xmms.c libmpdemux/demuxer.c libmpdemux/dvb_tune.c libmpdemux/dvbin.c libmpdemux/dvdnav_stream.c libmpdemux/mf.c libmpdemux/mp3_hdr.c libmpdemux/muxer.c libmpdemux/muxer_avi.c libmpdemux/muxer_lavf.c libmpdemux/muxer_mpeg.c libmpdemux/muxer_rawvideo.c libmpdemux/network.c libmpdemux/open.c libmpdemux/stream.c libmpdemux/stream.h libmpdemux/stream_dvd.c libmpdemux/stream_file.c libmpdemux/stream_ftp.c libmpdemux/stream_netstream.c libmpdemux/stream_smb.c libmpdemux/stream_vcd.c libmpdemux/stream_vstream.c libmpdemux/test.c libmpdemux/tv.c libmpdemux/tv.h libmpdemux/tvi_bsdbt848.c libmpdemux/tvi_dummy.c libmpdemux/tvi_v4l.c libmpdemux/tvi_v4l2.c libmpdemux/video.c
diffstat 151 files changed, 430 insertions(+), 430 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_faad.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_faad.c	Fri Nov 18 14:39:25 2005 +0000
@@ -27,7 +27,7 @@
 #ifndef USE_INTERNAL_FAAD
 #include <faad.h>
 #else
-#include "../libfaad2/faad.h"
+#include "libfaad2/faad.h"
 #endif
 
 /* configure maximum supported channels, *
--- a/libmpcodecs/ad_hwac3.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_hwac3.c	Fri Nov 18 14:39:25 2005 +0000
@@ -18,7 +18,7 @@
 
 #include "ad_internal.h"
 
-#include "../liba52/a52.h"
+#include "liba52/a52.h"
 
 
 static int isdts = -1;
--- a/libmpcodecs/ad_internal.h	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_internal.h	Fri Nov 18 14:39:25 2005 +0000
@@ -1,6 +1,6 @@
 
 #include "codec-cfg.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
 #include "stream.h"
 #include "demuxer.h"
--- a/libmpcodecs/ad_liba52.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_liba52.c	Fri Nov 18 14:39:25 2005 +0000
@@ -14,10 +14,10 @@
 
 #include "cpudetect.h"
 
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
-#include "../liba52/a52.h"
-#include "../liba52/mm_accel.h"
+#include "liba52/a52.h"
+#include "liba52/mm_accel.h"
 
 static sample_t * a52_samples;
 static a52_state_t a52_state;
--- a/libmpcodecs/ad_mp3lib.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_mp3lib.c	Fri Nov 18 14:39:25 2005 +0000
@@ -18,7 +18,7 @@
 
 LIBAD_EXTERN(mp3lib)
 
-#include "../mp3lib/mp3.h"
+#include "mp3lib/mp3.h"
 
 extern int fakemono;
 
--- a/libmpcodecs/ad_mpc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_mpc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -13,8 +13,8 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "../libaf/af_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/fastmemcpy.h"
 
 static ad_info_t info = 
 {
--- a/libmpcodecs/ad_pcm.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_pcm.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,7 +4,7 @@
 
 #include "config.h"
 #include "ad_internal.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
 static ad_info_t info = 
 {
--- a/libmpcodecs/ad_qtaudio.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_qtaudio.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #if defined(USE_QTX_CODECS) || defined(MACOSX)
 #include "wine/windef.h"
--- a/libmpcodecs/ad_realaud.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_realaud.c	Fri Nov 18 14:39:25 2005 +0000
@@ -158,7 +158,7 @@
 #ifdef USE_WIN32DLL
 
 #ifdef WIN32_LOADER
-#include "../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 void* WINAPI LoadLibraryA(char* name);
 void* WINAPI GetProcAddress(void* handle,char *func);
--- a/libmpcodecs/ad_twin.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ad_twin.c	Fri Nov 18 14:39:25 2005 +0000
@@ -7,9 +7,9 @@
 
 #include "ad_internal.h"
 #include "vqf.h"
-#include "../../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #include "wine/windef.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
 #include "help_mp.h"
 
--- a/libmpcodecs/ae.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae.c	Fri Nov 18 14:39:25 2005 +0000
@@ -9,7 +9,7 @@
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae.h"
-#include "../config.h"
+#include "config.h"
 
 #include "ae_pcm.h"
 
--- a/libmpcodecs/ae_faac.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae_faac.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,9 +5,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include <faac.h>
--- a/libmpcodecs/ae_lame.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae_lame.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,14 +5,14 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 #include "muxer.h"
-#include "../help_mp.h"
+#include "help_mp.h"
 #include "ae_pcm.h"
-#include "../libaf/af_format.h"
-#include "../libmpdemux/mp3_hdr.h"
+#include "libaf/af_format.h"
+#include "libmpdemux/mp3_hdr.h"
 
 #undef CDECL
 #include <lame/lame.h>
--- a/libmpcodecs/ae_lavc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae_lavc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,14 +5,14 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_lavc.h"
 #include "help_mp.h"
-#include "../config.h"
-#include "../libaf/af_format.h"
+#include "config.h"
+#include "libaf/af_format.h"
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #else
--- a/libmpcodecs/ae_pcm.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae_pcm.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,9 +5,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_pcm.h"
--- a/libmpcodecs/ae_toolame.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae_toolame.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,13 +5,13 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_toolame.h"
-#include "../libmpdemux/mp3_hdr.h"
+#include "libmpdemux/mp3_hdr.h"
 
 
 static int 
--- a/libmpcodecs/ae_twolame.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ae_twolame.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,13 +5,13 @@
 #include <string.h>
 #include <sys/types.h>
 #include "m_option.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "aviheader.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 #include "ms_hdr.h"
 #include "muxer.h"
 #include "ae_twolame.h"
-#include "../libmpdemux/mp3_hdr.h"
+#include "libmpdemux/mp3_hdr.h"
 
 
 static int 
--- a/libmpcodecs/dec_audio.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/dec_audio.c	Fri Nov 18 14:39:25 2005 +0000
@@ -14,9 +14,9 @@
 
 #include "dec_audio.h"
 #include "ad.h"
-#include "../libaf/af_format.h"
+#include "libaf/af_format.h"
 
-#include "../libaf/af.h"
+#include "libaf/af.h"
 
 #ifdef DYNAMIC_PLUGINS
 #include <dlfcn.h>
--- a/libmpcodecs/native/nuppelvideo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/native/nuppelvideo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -15,7 +15,7 @@
 #include "mp_msg.h"
 #include "bswap.h"
 
-#include "../../libvo/fastmemcpy.h"
+#include "../libvo/fastmemcpy.h"
 
 #include "libmpdemux/nuppelvideo.h" 
 #include "RTjpegN.h"
--- a/libmpcodecs/vd_libmpeg2.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vd_libmpeg2.c	Fri Nov 18 14:39:25 2005 +0000
@@ -27,7 +27,7 @@
 #include "libmpeg2/attributes.h"
 #include "libmpeg2/mpeg2_internal.h"
 
-#include "../cpudetect.h"
+#include "cpudetect.h"
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
--- a/libmpcodecs/vd_qtvideo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vd_qtvideo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -23,7 +23,7 @@
 
 LIBVD_EXTERN(qtvideo)
 
-#include "../bswap.h"
+#include "bswap.h"
 
 #ifdef MACOSX
 #include <QuickTime/ImageCodec.h>
--- a/libmpcodecs/vd_realvid.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vd_realvid.c	Fri Nov 18 14:39:25 2005 +0000
@@ -151,7 +151,7 @@
 #ifdef USE_WIN32DLL
 
 #ifdef WIN32_LOADER
-#include "../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
 #endif
 void* WINAPI LoadLibraryA(char* name);
 void* WINAPI GetProcAddress(void* handle,char* func);
--- a/libmpcodecs/ve.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/ve_divx4.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_divx4.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_DIVX4ENCORE
 
--- a/libmpcodecs/ve_lavc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_lavc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -8,12 +8,12 @@
 #define INFINITY HUGE_VAL
 #endif
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #include "codec-cfg.h"
 #include "stream.h"
--- a/libmpcodecs/ve_libdv.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_libdv.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,8 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_LIBDV095
 
--- a/libmpcodecs/ve_nuv.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_nuv.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "m_option.h"
 
--- a/libmpcodecs/ve_qtvideo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_qtvideo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -8,16 +8,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../bswap.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "bswap.h"
 
 #ifdef WIN32_LOADER 
 #include "ldt_keeper.h" 
 #endif 
 
 #ifdef USE_QTX_CODECS
-#include "../loader/qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 #include "wine/windef.h"
 
 #include "codec-cfg.h"
--- a/libmpcodecs/ve_raw.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_raw.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "codec-cfg.h"
 #include "stream.h"
--- a/libmpcodecs/ve_vfw.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_vfw.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,10 +4,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "../config.h"
+#include "config.h"
 #ifdef USE_WIN32DLL
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include "codec-cfg.h"
 //#include "stream.h"
--- a/libmpcodecs/ve_x264.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_x264.c	Fri Nov 18 14:39:25 2005 +0000
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_X264
 
--- a/libmpcodecs/ve_xvid.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_xvid.c	Fri Nov 18 14:39:25 2005 +0000
@@ -9,8 +9,8 @@
 #define INFINITY HUGE_VAL
 #endif
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_XVID3
 
--- a/libmpcodecs/ve_xvid4.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/ve_xvid4.c	Fri Nov 18 14:39:25 2005 +0000
@@ -33,8 +33,8 @@
 #include <limits.h>
 #include <time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_XVID4
 
--- a/libmpcodecs/vf.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
@@ -11,17 +11,17 @@
 #include <assert.h>
 #endif
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "mp_msg.h"
+#include "help_mp.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 extern vf_info_t vf_info_vo;
 extern vf_info_t vf_info_rectangle;
--- a/libmpcodecs/vf_1bpp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_1bpp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../postproc/rgb2rgb.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_2xsai.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_2xsai.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_bmovl.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_bmovl.c	Fri Nov 18 14:39:25 2005 +0000
@@ -66,13 +66,13 @@
 #include "mp_image.h"
 #include "vf.h"
 #include "img_format.h"
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_NO_POSIX_SELECT
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define IS_RAWIMG	0x100
 #define IS_IMG		0x200
--- a/libmpcodecs/vf_boxblur.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_boxblur.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 //===========================================================================//
--- a/libmpcodecs/vf_crop.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_crop.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_cropdetect.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_cropdetect.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int x1,y1,x2,y2;
--- a/libmpcodecs/vf_decimate.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_decimate.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 struct vf_priv_s {
--- a/libmpcodecs/vf_delogo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_delogo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -24,9 +24,9 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -35,7 +35,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #include "m_option.h"
 #include "m_struct.h"
--- a/libmpcodecs/vf_denoise3d.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_denoise3d.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define PARAM1_DEFAULT 4.0
 #define PARAM2_DEFAULT 3.0
--- a/libmpcodecs/vf_detc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_detc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct metrics {
 	int even;
--- a/libmpcodecs/vf_dint.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_dint.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../libvo/fastmemcpy.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "libvo/fastmemcpy.h"
 
 #include "mp_image.h"
 #include "img_format.h"
--- a/libmpcodecs/vf_divtc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_divtc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,16 +4,16 @@
 #include <limits.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
-#include "../bswap.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
+#include "bswap.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 vf_info_t vf_info_divtc;
 
--- a/libmpcodecs/vf_down3dright.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_down3dright.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
 	int skipline;
--- a/libmpcodecs/vf_dsize.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_dsize.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_dvbscale.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_dvbscale.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_eq.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_eq.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,17 +3,17 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/video_out.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 #include "m_option.h"
 #include "m_struct.h"
--- a/libmpcodecs/vf_expand.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_expand.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,18 +4,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #ifdef OSD_SUPPORT
-#include "../libvo/sub.h"
-#include "../libvo/osd.h"
+#include "libvo/sub.h"
+#include "libvo/osd.h"
 #endif
 
 #include "m_option.h"
--- a/libmpcodecs/vf_fame.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_fame.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 //#ifdef USE_LIBFAME
 
@@ -15,7 +15,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-//#include "../libvo/fastmemcpy.h"
+//#include "libvo/fastmemcpy.h"
 #include <fame.h>
 
 struct vf_priv_s {
--- a/libmpcodecs/vf_field.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_field.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
     int field;
--- a/libmpcodecs/vf_fil.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_fil.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
     int interleave;
--- a/libmpcodecs/vf_filmdint.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_filmdint.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,16 +4,16 @@
 #include <signal.h>
 #include <sys/time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "cmmx.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define NUM_STORED 4
 
--- a/libmpcodecs/vf_flip.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_flip.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_format.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_format.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_framestep.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_framestep.c	Fri Nov 18 14:39:25 2005 +0000
@@ -51,15 +51,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /* Uncomment if you want to print some info on the format */
 // #define DUMP_FORMAT_DATA
--- a/libmpcodecs/vf_fspp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_fspp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -36,19 +36,19 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/dsputil.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -58,7 +58,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 #define BLOCKSZ 12
@@ -690,7 +690,7 @@
 //Specific spp's dct, idct and threshold functions
 //I'd prefer to have them in the separate file.
 
-#include "../mangle.h"
+#include "mangle.h"
 //#define MANGLE(a) #a
 
 //typedef int16_t DCTELEM; //! only int16_t
--- a/libmpcodecs/vf_halfpack.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_halfpack.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
 	int field;
--- a/libmpcodecs/vf_harddup.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_harddup.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	mp_image_t *last_mpi;
--- a/libmpcodecs/vf_hqdn3d.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_hqdn3d.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define PARAM1_DEFAULT 4.0
 #define PARAM2_DEFAULT 3.0
--- a/libmpcodecs/vf_hue.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_hue.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,15 +4,15 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 #include "m_option.h"
 #include "m_struct.h"
--- a/libmpcodecs/vf_il.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_il.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 //===========================================================================//
--- a/libmpcodecs/vf_ilpack.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_ilpack.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
 	unsigned char *u, unsigned char *v, int w, int us, int vs);
--- a/libmpcodecs/vf_ivtc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_ivtc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 struct metrics {
--- a/libmpcodecs/vf_kerndeint.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_kerndeint.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_lavc.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_lavc.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #ifdef USE_LIBAVCODEC
 
@@ -13,7 +13,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-//#include "../libvo/fastmemcpy.h"
+//#include "libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
--- a/libmpcodecs/vf_lavcdeint.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_lavcdeint.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,9 +3,9 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #ifdef USE_LIBAVCODEC
 
@@ -13,7 +13,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-//#include "../libvo/fastmemcpy.h"
+//#include "libvo/fastmemcpy.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
--- a/libmpcodecs/vf_mirror.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_mirror.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 
 static void mirror(unsigned char* dst,unsigned char* src,int dststride,int srcstride,int w,int h,int bpp,unsigned int fmt){
--- a/libmpcodecs/vf_noformat.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_noformat.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_noise.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_noise.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,9 +22,9 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -33,7 +33,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define MAX_NOISE 4096
 #define MAX_SHIFT 1024
--- a/libmpcodecs/vf_palette.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_palette.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../postproc/rgb2rgb.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_perspective.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_perspective.c	Fri Nov 18 14:39:25 2005 +0000
@@ -23,8 +23,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -33,7 +33,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define SUB_PIXEL_BITS 8
 #define SUB_PIXELS (1<<SUB_PIXEL_BITS)
--- a/libmpcodecs/vf_phase.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_phase.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <limits.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 enum mode { PROGRESSIVE, TOP_FIRST, BOTTOM_FIRST,
 	    TOP_FIRST_ANALYZE, BOTTOM_FIRST_ANALYZE,
--- a/libmpcodecs/vf_pp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_pp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,9 +4,9 @@
 #include <inttypes.h>
 #include <errno.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -20,10 +20,10 @@
 
 #define EMU_OLD
 
-#include "../libavcodec/libpostproc/postprocess.h"
+#include "libavcodec/libpostproc/postprocess.h"
 
 #ifdef EMU_OLD
-#include "../libavcodec/libpostproc/postprocess_internal.h"
+#include "libavcodec/libpostproc/postprocess_internal.h"
 #endif
 
 struct vf_priv_s {
--- a/libmpcodecs/vf_pp7.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_pp7.c	Fri Nov 18 14:39:25 2005 +0000
@@ -23,10 +23,10 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -35,7 +35,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
 
--- a/libmpcodecs/vf_pullup.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_pullup.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #include "pullup.h"
 
--- a/libmpcodecs/vf_qp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_qp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,12 +22,12 @@
 #include <math.h>
 #include <inttypes.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #if 1
 double ff_eval(char *s, double *const_value, const char **const_name,
@@ -44,9 +44,9 @@
 #include <ffmpeg/dsputil.h>
 #include <ffmpeg/common.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
-#include "../libavutil/common.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavutil/common.h"
 #endif
 
 /* FIXME: common.h defines printf away when HAVE_AV_CONFIG
@@ -61,7 +61,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 struct vf_priv_s {
--- a/libmpcodecs/vf_rectangle.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_rectangle.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mp_image.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
     int x, y, w, h;
--- a/libmpcodecs/vf_remove_logo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_remove_logo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -90,9 +90,9 @@
 #include <ctype.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../libvo/fastmemcpy.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "libvo/fastmemcpy.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_rgb2bgr.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_rgb2bgr.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_rgbtest.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_rgbtest.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,14 +3,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_rotate.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_rotate.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int direction;
--- a/libmpcodecs/vf_sab.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_sab.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,8 +32,8 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 
 
--- a/libmpcodecs/vf_scale.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_scale.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,16 +3,16 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 
 #include "m_option.h"
--- a/libmpcodecs/vf_screenshot.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_screenshot.c	Fri Nov 18 14:39:25 2005 +0000
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 #ifdef HAVE_PNG
 
 #include <stdio.h>
@@ -15,16 +15,16 @@
 
 #include <png.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 #include "vf_scale.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
+#include "postproc/rgb2rgb.h"
 
 struct vf_priv_s {
     int frameno;
--- a/libmpcodecs/vf_smartblur.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_smartblur.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,8 +32,8 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/swscale.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/swscale.h"
 #include "vf_scale.h"
 
 //===========================================================================//
--- a/libmpcodecs/vf_softpulldown.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_softpulldown.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/sub.h"
+#include "libvo/fastmemcpy.h"
+#include "libvo/sub.h"
 
 struct vf_priv_s {
 	int state;
--- a/libmpcodecs/vf_softskip.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_softskip.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int skipflag;
--- a/libmpcodecs/vf_spp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_spp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -30,19 +30,19 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/dsputil.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -52,7 +52,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
 
--- a/libmpcodecs/vf_swapuv.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_swapuv.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #include <inttypes.h>
 #include <assert.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -32,7 +32,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 
 //===========================================================================//
--- a/libmpcodecs/vf_telecine.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_telecine.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,14 +2,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int frame;
--- a/libmpcodecs/vf_test.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_test.c	Fri Nov 18 14:39:25 2005 +0000
@@ -21,14 +21,14 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_tfields.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_tfields.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int mode;
--- a/libmpcodecs/vf_tile.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_tile.c	Fri Nov 18 14:39:25 2005 +0000
@@ -37,15 +37,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /* external */
 extern int verbose;
--- a/libmpcodecs/vf_tinterlace.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_tinterlace.c	Fri Nov 18 14:39:25 2005 +0000
@@ -20,14 +20,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 struct vf_priv_s {
 	int mode;
--- a/libmpcodecs/vf_unsharp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_unsharp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -23,9 +23,9 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -34,7 +34,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #ifndef MIN
 #define        MIN(a,b) (((a)<(b))?(a):(b))
--- a/libmpcodecs/vf_uspp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_uspp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,19 +22,19 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifdef USE_LIBAVCODEC
 
-#include "../mp_msg.h"
-#include "../cpudetect.h"
+#include "mp_msg.h"
+#include "cpudetect.h"
 
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #include <ffmpeg/dsputil.h>
 #else
-#include "../libavcodec/avcodec.h"
-#include "../libavcodec/dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -44,7 +44,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
 
--- a/libmpcodecs/vf_vo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_vo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_yuvcsp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_yuvcsp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
--- a/libmpcodecs/vf_yuy2.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_yuy2.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 #include "vf_scale.h"
 
 //===========================================================================//
--- a/libmpcodecs/vf_yvu9.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_yvu9.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,15 +3,15 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
-#include "../libvo/fastmemcpy.h"
-#include "../postproc/rgb2rgb.h"
+#include "libvo/fastmemcpy.h"
+#include "postproc/rgb2rgb.h"
 
 //===========================================================================//
 
--- a/libmpcodecs/vf_zrmjpeg.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vf_zrmjpeg.c	Fri Nov 18 14:39:25 2005 +0000
@@ -14,23 +14,23 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
 
 #ifdef USE_FASTMEMCPY
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 #endif
 
 /* 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"
 
 #undef malloc
 #undef free
--- a/libmpcodecs/vqf.h	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpcodecs/vqf.h	Fri Nov 18 14:39:25 2005 +0000
@@ -156,7 +156,7 @@
 /*************************************************/
 /*** Definitions about TwinVQ bitstream header ***/
 /*************************************************/
-//#include "../declib_src/tvq_hdr.h"
+//#include "declib_src/tvq_hdr.h"
 //#ifndef	BUFSIZ
 //#define	BUFSIZ		1024
 //#endif
--- a/libmpdemux/cache2.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/cache2.c	Fri Nov 18 14:39:25 2005 +0000
@@ -17,10 +17,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../osdep/timer.h"
+#include "osdep/timer.h"
 #ifndef WIN32
 #include <sys/wait.h>
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 #else
 #include <windows.h>
 static DWORD WINAPI ThreadProc(void* s);
--- a/libmpdemux/cdda.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/cdda.c	Fri Nov 18 14:39:25 2005 +0000
@@ -3,9 +3,9 @@
 #ifdef HAVE_CDDA
 
 #include "stream.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../bswap.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "bswap.h"
 
 #include <stdio.h>
 #include <stdlib.h>
--- a/libmpdemux/cddb.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/cddb.c	Fri Nov 18 14:39:25 2005 +0000
@@ -48,7 +48,7 @@
 #endif
 
 #include "cdd.h"
-#include "../version.h"
+#include "version.h"
 #include "stream.h"
 #include "network.h"
 
--- a/libmpdemux/cue_read.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/cue_read.c	Fri Nov 18 14:39:25 2005 +0000
@@ -17,8 +17,8 @@
 
 #include "cue_read.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #define byte    unsigned char
 #define SIZERAW 2352
--- a/libmpdemux/demux_asf.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_asf.c	Fri Nov 18 14:39:25 2005 +0000
@@ -12,7 +12,7 @@
 #include "asf.h"
 #include "demuxer.h"
 
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 /*
  * Load 16/32-bit values in little endian byte order
--- a/libmpdemux/demux_audio.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_audio.c	Fri Nov 18 14:39:25 2005 +0000
@@ -1,6 +1,6 @@
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #include <stdlib.h>
 #include <stdio.h>
--- a/libmpdemux/demux_mkv.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_mkv.c	Fri Nov 18 14:39:25 2005 +0000
@@ -20,8 +20,8 @@
 #include "matroska.h"
 #include "bswap.h"
 
-#include "../subreader.h"
-#include "../libvo/sub.h"
+#include "subreader.h"
+#include "libvo/sub.h"
 
 #ifdef USE_QTX_CODECS
 #include "qtx/qtxsdk/components.h"
@@ -34,7 +34,7 @@
 #ifdef USE_LIBLZO
 #include <lzo1x.h>
 #else
-#include "../libmpcodecs/native/minilzo.h"
+#include "libmpcodecs/native/minilzo.h"
 #endif
 
 #if !defined(MIN)
--- a/libmpdemux/demux_mov.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_mov.c	Fri Nov 18 14:39:25 2005 +0000
@@ -40,7 +40,7 @@
 #include <QuickTime/ImageCompression.h>
 #include <QuickTime/ImageCodec.h>
 #else
-#include "../loader/qtx/qtxsdk/components.h"
+#include "loader/qtx/qtxsdk/components.h"
 #endif
 
 #ifdef HAVE_ZLIB
--- a/libmpdemux/demux_ogg.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_ogg.c	Fri Nov 18 14:39:25 2005 +0000
@@ -9,8 +9,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
@@ -161,8 +161,8 @@
 //-------- subtitle support - should be moved to decoder layer, and queue
 //                          - subtitles up in demuxer buffer...
 
-#include "../subreader.h"
-#include "../libvo/sub.h"
+#include "subreader.h"
+#include "libvo/sub.h"
 #define OGG_SUB_MAX_LINE 128
 
 static subtitle ogg_sub;
--- a/libmpdemux/demux_rawaudio.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_rawaudio.c	Fri Nov 18 14:39:25 2005 +0000
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../m_option.h"
+#include "m_option.h"
 
 #include "stream.h"
 #include "demuxer.h"
--- a/libmpdemux/demux_rawvideo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_rawvideo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -6,13 +6,13 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../m_option.h"
+#include "m_option.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libmpcodecs/img_format.h"
+#include "libmpcodecs/img_format.h"
 
 extern int demuxer_type;
 static int format = IMGFMT_I420;
--- a/libmpdemux/demux_ts.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_ts.c	Fri Nov 18 14:39:25 2005 +0000
@@ -35,7 +35,7 @@
 #include "stheader.h"
 
 #include "bswap.h"
-#include "../unrarlib.h"
+#include "unrarlib.h"
 #include "ms_hdr.h"
 #include "mpeg_hdr.h"
 
--- a/libmpdemux/demux_ty.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_ty.c	Fri Nov 18 14:39:25 2005 +0000
@@ -43,7 +43,7 @@
 #include "demuxer.h"
 #include "parse_es.h"
 #include "stheader.h"
-#include "../sub_cc.h"
+#include "sub_cc.h"
 
 extern void skip_audio_frame( sh_audio_t *sh_audio );
 extern int sub_justify;
--- a/libmpdemux/demux_ty_osd.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_ty_osd.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,9 +22,9 @@
 //#include "parse_es.h"
 //#include "stheader.h"
 //#include "mp3_hdr.h"
-//#include "../subreader.h"
-#include "../sub_cc.h"
-#include "../libvo/sub.h"
+//#include "subreader.h"
+#include "sub_cc.h"
+#include "libvo/sub.h"
 
 //#include "dvdauth.h"
 
--- a/libmpdemux/demux_vqf.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_vqf.c	Fri Nov 18 14:39:25 2005 +0000
@@ -7,7 +7,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../libmpcodecs/vqf.h"
+#include "libmpcodecs/vqf.h"
 
 static int demux_probe_vqf(demuxer_t* demuxer) 
 {
--- a/libmpdemux/demux_xmms.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demux_xmms.c	Fri Nov 18 14:39:25 2005 +0000
@@ -12,8 +12,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "../m_option.h"
-#include "../libaf/af_format.h"
+#include "m_option.h"
+#include "libaf/af_format.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
--- a/libmpdemux/demuxer.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/demuxer.c	Fri Nov 18 14:39:25 2005 +0000
@@ -11,15 +11,15 @@
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../m_config.h"
+#include "m_config.h"
 
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "mf.h"
 
-#include "../libaf/af_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/fastmemcpy.h"
 
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 
--- a/libmpdemux/dvb_tune.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/dvb_tune.c	Fri Nov 18 14:39:25 2005 +0000
@@ -53,7 +53,7 @@
 #endif
 
 #include "dvbin.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 
 
--- a/libmpdemux/dvbin.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/dvbin.c	Fri Nov 18 14:39:25 2005 +0000
@@ -44,8 +44,8 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include "dvbin.h"
 
--- a/libmpdemux/dvdnav_stream.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/dvdnav_stream.c	Fri Nov 18 14:39:25 2005 +0000
@@ -7,14 +7,14 @@
 #include <unistd.h>
 #include <string.h>
 #include "mp_msg.h"
-#include "../osdep/timer.h"
-#include "../input/input.h"
+#include "osdep/timer.h"
+#include "input/input.h"
 #include "stream.h"
 #include "dvdnav_stream.h"
-#include "../libvo/video_out.h"
-#include "../spudec.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "libvo/video_out.h"
+#include "spudec.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   int track;
--- a/libmpdemux/mf.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/mf.c	Fri Nov 18 14:39:25 2005 +0000
@@ -14,7 +14,7 @@
 #ifdef HAVE_GLOB
 #include <glob.h>
 #else
-#include "../osdep/glob.h"
+#include "osdep/glob.h"
 #endif
 
 #include "mp_msg.h"
--- a/libmpdemux/mp3_hdr.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/mp3_hdr.c	Fri Nov 18 14:39:25 2005 +0000
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include "config.h"
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 //----------------------- mp3 audio frame header parser -----------------------
 
--- a/libmpdemux/muxer.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/muxer.c	Fri Nov 18 14:39:25 2005 +0000
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 #include "aviheader.h"
 #include "ms_hdr.h"
--- a/libmpdemux/muxer_avi.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/muxer_avi.c	Fri Nov 18 14:39:25 2005 +0000
@@ -6,7 +6,7 @@
 #include <limits.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 #include "stream.h"
 #include "demuxer.h"
--- a/libmpdemux/muxer_lavf.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/muxer_lavf.c	Fri Nov 18 14:39:25 2005 +0000
@@ -4,8 +4,8 @@
 #include <sys/types.h>
 #include <inttypes.h>
 #include "config.h"
-#include "../version.h"
-#include "../mp_msg.h"
+#include "version.h"
+#include "mp_msg.h"
 
 #include "bswap.h"
 #include "aviheader.h"
@@ -15,7 +15,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../m_option.h"
+#include "m_option.h"
 #include "avformat.h"
 
 extern unsigned int codec_get_wav_tag(int id);
--- a/libmpdemux/muxer_mpeg.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/muxer_mpeg.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,8 +5,8 @@
 #include <sys/types.h>
 
 #include "config.h"
-#include "../version.h"
-#include "../mp_msg.h"
+#include "version.h"
+#include "mp_msg.h"
 
 #include "bswap.h"
 
@@ -17,7 +17,7 @@
 #include "stream.h"
 #include "demuxer.h"
 #include "stheader.h"
-#include "../m_option.h"
+#include "m_option.h"
 #include "mpeg_hdr.h"
 
 #define PACK_HEADER_START_CODE 0x01ba
--- a/libmpdemux/muxer_rawvideo.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/muxer_rawvideo.c	Fri Nov 18 14:39:25 2005 +0000
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../version.h"
+#include "version.h"
 
 //#include "stream.h"
 //#include "demuxer.h"
--- a/libmpdemux/network.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/network.c	Fri Nov 18 14:39:25 2005 +0000
@@ -25,14 +25,14 @@
 
 #include "stream.h"
 #include "demuxer.h"
-#include "../m_config.h"
+#include "m_config.h"
 
 #include "network.h"
 #include "http.h"
 #include "cookies.h"
 #include "url.h"
 
-#include "../version.h"
+#include "version.h"
 
 extern int verbose;
 extern int stream_cache_size;
--- a/libmpdemux/open.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/open.c	Fri Nov 18 14:39:25 2005 +0000
@@ -15,7 +15,7 @@
 #include <sys/cdrio.h>
 #endif
 
-#include "../m_option.h"
+#include "m_option.h"
 #include "stream.h"
 #include "demuxer.h"
 #include "mf.h"
--- a/libmpdemux/stream.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream.c	Fri Nov 18 14:39:25 2005 +0000
@@ -23,13 +23,13 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "../osdep/shmem.h"
+#include "osdep/shmem.h"
 
 #include "stream.h"
 #include "demuxer.h"
 
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 
 extern int verbose; // defined in mplayer.c
--- a/libmpdemux/stream.h	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream.h	Fri Nov 18 14:39:25 2005 +0000
@@ -275,15 +275,15 @@
 
 #ifdef USE_MPDVDKIT
 #if (USE_MPDVDKIT == 2)
-#include "../libmpdvdkit2/dvd_reader.h"
-#include "../libmpdvdkit2/ifo_types.h"
-#include "../libmpdvdkit2/ifo_read.h"
-#include "../libmpdvdkit2/nav_read.h"
+#include "libmpdvdkit2/dvd_reader.h"
+#include "libmpdvdkit2/ifo_types.h"
+#include "libmpdvdkit2/ifo_read.h"
+#include "libmpdvdkit2/nav_read.h"
 #else
-#include "../libmpdvdkit/dvd_reader.h"
-#include "../libmpdvdkit/ifo_types.h"
-#include "../libmpdvdkit/ifo_read.h"
-#include "../libmpdvdkit/nav_read.h"
+#include "libmpdvdkit/dvd_reader.h"
+#include "libmpdvdkit/ifo_types.h"
+#include "libmpdvdkit/ifo_read.h"
+#include "libmpdvdkit/nav_read.h"
 #endif
 #else
 #include <dvdread/dvd_reader.h>
--- a/libmpdemux/stream_dvd.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_dvd.c	Fri Nov 18 14:39:25 2005 +0000
@@ -22,8 +22,8 @@
 #define FIRST_PCM_AID 160
 
 #include "stream.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 /// We keep these 2 for the gui atm, but they will be removed.
 int dvd_title=0;
--- a/libmpdemux/stream_file.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_file.c	Fri Nov 18 14:39:25 2005 +0000
@@ -10,8 +10,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   char* filename;
--- a/libmpdemux/stream_ftp.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_ftp.c	Fri Nov 18 14:39:25 2005 +0000
@@ -21,8 +21,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
   char* user;
--- a/libmpdemux/stream_netstream.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_netstream.c	Fri Nov 18 14:39:25 2005 +0000
@@ -60,9 +60,9 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
-#include "../bswap.h"
+#include "m_option.h"
+#include "m_struct.h"
+#include "bswap.h"
 
 #include "netstream.h"
 
--- a/libmpdemux/stream_smb.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_smb.c	Fri Nov 18 14:39:25 2005 +0000
@@ -9,8 +9,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 static struct stream_priv_s {
 } stream_priv_dflts = {
--- a/libmpdemux/stream_vcd.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_vcd.c	Fri Nov 18 14:39:25 2005 +0000
@@ -5,8 +5,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include <fcntl.h>
 #include <stdlib.h>
--- a/libmpdemux/stream_vstream.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/stream_vstream.c	Fri Nov 18 14:39:25 2005 +0000
@@ -51,8 +51,8 @@
 #include "mp_msg.h"
 #include "stream.h"
 #include "help_mp.h"
-#include "../m_option.h"
-#include "../m_struct.h"
+#include "m_option.h"
+#include "m_struct.h"
 
 #include <vstream-client.h>
 
--- a/libmpdemux/test.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/test.c	Fri Nov 18 14:39:25 2005 +0000
@@ -25,7 +25,7 @@
 }
 
 // for libmpdvdkit2:
-#include "../get_path.c"
+#include "get_path.c"
 
 int verbose=5; // must be global!
 
--- a/libmpdemux/tv.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/tv.c	Fri Nov 18 14:39:25 2005 +0000
@@ -29,9 +29,9 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
+#include "libvo/fastmemcpy.h"
 
 #include "tv.h"
 
--- a/libmpdemux/tv.h	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/tv.h	Fri Nov 18 14:39:25 2005 +0000
@@ -4,9 +4,9 @@
 extern int tv_param_on;
 
 #ifdef USE_TV
-//#include "../libao2/afmt.h"
-//#include "../libvo/img_format.h"
-//#include "../libvo/fastmemcpy.h"
+//#include "libao2/afmt.h"
+//#include "libvo/img_format.h"
+//#include "libvo/fastmemcpy.h"
 //#include "mp_msg.h"
 
 extern char *tv_param_freq;
--- a/libmpdemux/tvi_bsdbt848.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/tvi_bsdbt848.c	Fri Nov 18 14:39:25 2005 +0000
@@ -64,8 +64,8 @@
 #endif
 #endif
 
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
 #include "tv.h"
 
 /* information about this file */
--- a/libmpdemux/tvi_dummy.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/tvi_dummy.c	Fri Nov 18 14:39:25 2005 +0000
@@ -7,7 +7,7 @@
 #ifdef USE_TV
 
 #include <stdio.h>
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 #include "tv.h"
 
 /* information about this file */
--- a/libmpdemux/tvi_v4l.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/tvi_v4l.c	Fri Nov 18 14:39:25 2005 +0000
@@ -41,10 +41,10 @@
 #endif
 
 #include "mp_msg.h"
-#include "../libaf/af_format.h"
-#include "../libvo/img_format.h"
-#include "../libvo/fastmemcpy.h"
-#include "../libvo/videodev_mjpeg.h"
+#include "libaf/af_format.h"
+#include "libvo/img_format.h"
+#include "libvo/fastmemcpy.h"
+#include "libvo/videodev_mjpeg.h"
 
 #include "tv.h"
 
--- a/libmpdemux/tvi_v4l2.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/tvi_v4l2.c	Fri Nov 18 14:39:25 2005 +0000
@@ -42,9 +42,9 @@
 #endif
 #include <linux/types.h>
 #include <linux/videodev2.h>
-#include "../mp_msg.h"
-#include "../libvo/img_format.h"
-#include "../libaf/af_format.h"
+#include "mp_msg.h"
+#include "libvo/img_format.h"
+#include "libaf/af_format.h"
 #include "tv.h"
 #include "audio_in.h"
 
--- a/libmpdemux/video.c	Fri Nov 18 14:14:21 2005 +0000
+++ b/libmpdemux/video.c	Fri Nov 18 14:39:25 2005 +0000
@@ -20,7 +20,7 @@
 #include "mpeg_hdr.h"
 
 /* sub_cc (closed captions)*/
-#include "../sub_cc.h"
+#include "sub_cc.h"
 
 /* biCompression constant */
 #define BI_RGB        0L