Unify include paths, -I.. is in CFLAGS.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16986 b3059339-0415-0410-9bf9-f77b7e298cf2

22 files changed, 37 insertions, 37 deletions

diff --git a/osdep/fseeko.c b/osdep/fseeko.c
index 0ac11c29a7..decbaf5c8f 100644
--- a/osdep/fseeko.c
+++ b/osdep/fseeko.c
@@ -3,7 +3,7 @@
  *	  64-bit versions of fseeko/ftello() for systems which do not have them
  */
 
-#include "../config.h"
+#include "config.h"
  
 #if !defined(HAVE_FSEEKO) || !defined(HAVE_FTELLO)
 #include <stdio.h>
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 241321a420..03087eac6e 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 #include "keycodes.h"
-#include "../input/input.h"
+#include "input/input.h"
 
 int mp_input_win32_slave_cmd_func(int fd,char* dest,int size){
   DWORD retval;
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 803dc61736..e4a5c9cb1c 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -1,6 +1,6 @@
 /* GyS-TermIO v2.0 (for GySmail v3)          (C) 1999 A'rpi/ESP-team */
 
-#include "../config.h"
+#include "config.h"
 
 //#define USE_TERMCAP
 #if !defined(__OS2__) && !defined(__MORPHOS__)
diff --git a/osdep/gettimeofday.c b/osdep/gettimeofday.c
index 3579779812..860eb388e7 100644
--- a/osdep/gettimeofday.c
+++ b/osdep/gettimeofday.c
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GETTIMEOFDAY
 #include <sys/time.h>
diff --git a/osdep/glob-win.c b/osdep/glob-win.c
index d1e3dd87ae..e1408412cd 100644
--- a/osdep/glob-win.c
+++ b/osdep/glob-win.c
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GLOB
 #ifdef __MINGW32__
diff --git a/osdep/glob.h b/osdep/glob.h
index dae4a73109..4505bdb0f2 100644
--- a/osdep/glob.h
+++ b/osdep/glob.h
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GLOB
 #ifdef __MINGW32__
diff --git a/osdep/scandir.c b/osdep/scandir.c
index 46bb6b117a..739e65571a 100644
--- a/osdep/scandir.c
+++ b/osdep/scandir.c
@@ -4,7 +4,7 @@
  * implementation for systems that do not have it in libc
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_SCANDIR
 
diff --git a/osdep/shmem.c b/osdep/shmem.c
index ec496d92f1..4ab04c07ae 100644
--- a/osdep/shmem.c
+++ b/osdep/shmem.c
@@ -6,7 +6,7 @@
  *   Sun Apr  6 02:26:26 MET DST 1997
  */
 
-#include "../config.h"
+#include "config.h"
 
 #if defined(USE_STREAM_CACHE) && !defined(WIN32)
 
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #ifdef AIX
 #include <sys/select.h>
diff --git a/osdep/strl.c b/osdep/strl.c
index 664ab7905c..7feff09896 100644
--- a/osdep/strl.c
+++ b/osdep/strl.c
@@ -4,7 +4,7 @@
  * (C) 2003-2004 Nicholas J. Kain <njk@aerifal.cx>
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_STRLCPY
 unsigned int strlcpy (char *dest, const char *src, unsigned int size)
diff --git a/osdep/strsep.c b/osdep/strsep.c
index 863a39cc70..51e16c3599 100644
--- a/osdep/strsep.c
+++ b/osdep/strsep.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_STRSEP
 char *strsep(char **stringp, const char *delim) {
diff --git a/osdep/swab.c b/osdep/swab.c
index 45d26cbc14..1b0f2f172b 100644
--- a/osdep/swab.c
+++ b/osdep/swab.c
@@ -1,8 +1,8 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_SWAB
 /* system has no swab.  emulate via bswap */
-#include "../bswap.h"
+#include "bswap.h"
 #include <unistd.h>
 
 void swab(const void *from, void *to, ssize_t n) {
diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c
index b9b537954b..c0fd20c041 100644
--- a/osdep/timer-darwin.c
+++ b/osdep/timer-darwin.c
@@ -22,8 +22,8 @@
 #include <sys/time.h>
 #include <mach/mach_time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 #include "timer.h"
 
 /* global variables */
diff --git a/osdep/timer-lx.c b/osdep/timer-lx.c
index e0ecfb6e58..104cd97391 100644
--- a/osdep/timer-lx.c
+++ b/osdep/timer-lx.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/time.h>
-#include "../config.h"
+#include "config.h"
 
 const char *timer_name =
 #ifdef HAVE_NANOSLEEP
diff --git a/osdep/vsscanf.c b/osdep/vsscanf.c
index 49bfebe56c..0252ac287f 100644
--- a/osdep/vsscanf.c
+++ b/osdep/vsscanf.c
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_VSSCANF
 /* system has no vsscanf.  try to provide one */
diff --git a/postproc/cs_test.c b/postproc/cs_test.c
index 0e5fe4a26e..df54a7ee0b 100644
--- a/postproc/cs_test.c
+++ b/postproc/cs_test.c
@@ -22,7 +22,7 @@
 
 #include "swscale.h"
 #include "rgb2rgb.h"
-#include "../cpudetect.h"
+#include "cpudetect.h"
 
 #define SIZE 1000
 #define srcByte 0x55
diff --git a/postproc/rgb2rgb.c b/postproc/rgb2rgb.c
index c9af67e74c..94289a43bc 100644
--- a/postproc/rgb2rgb.c
+++ b/postproc/rgb2rgb.c
@@ -8,13 +8,13 @@
  *  palette & yuv & runtime cpu stuff by Michael (michaelni@gmx.at) (under GPL)
  */
 #include <inttypes.h>
-#include "../config.h"
+#include "config.h"
 #include "rgb2rgb.h"
 #include "swscale.h"
-#include "../cpudetect.h"
-#include "../mangle.h"
-#include "../bswap.h"
-#include "../libvo/fastmemcpy.h"
+#include "cpudetect.h"
+#include "mangle.h"
+#include "bswap.h"
+#include "libvo/fastmemcpy.h"
 
 #define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit
 
diff --git a/postproc/swscale-example.c b/postproc/swscale-example.c
index ce245b091b..3509eca6bf 100644
--- a/postproc/swscale-example.c
+++ b/postproc/swscale-example.c
@@ -22,10 +22,10 @@
 #include <inttypes.h>
 #include <stdarg.h>
 
-#include "../config.h"
+#include "config.h"
 
 #include "swscale.h"
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 
 static int testFormat[]={
 IMGFMT_YVU9,
diff --git a/postproc/swscale.c b/postproc/swscale.c
index 75599ec900..941a486b0d 100644
--- a/postproc/swscale.c
+++ b/postproc/swscale.c
@@ -54,8 +54,8 @@ untested special converters
 #include <math.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 #include <assert.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -70,11 +70,11 @@ untested special converters
 #endif
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "../cpudetect.h"
-#include "../bswap.h"
-#include "../libvo/img_format.h"
+#include "cpudetect.h"
+#include "bswap.h"
+#include "libvo/img_format.h"
 #include "rgb2rgb.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #undef MOVNTQ
 #undef PAVGB
diff --git a/postproc/swscale_internal.h b/postproc/swscale_internal.h
index fff873297c..9a8a9b4b35 100644
--- a/postproc/swscale_internal.h
+++ b/postproc/swscale_internal.h
@@ -29,7 +29,7 @@
 #define AVV(x...) {x}
 #endif
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
 #define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args )
diff --git a/postproc/yuv2rgb.c b/postproc/yuv2rgb.c
index d8a31ef93a..63e465fb84 100644
--- a/postproc/yuv2rgb.c
+++ b/postproc/yuv2rgb.c
@@ -40,8 +40,8 @@
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "../mangle.h"
-#include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "mangle.h"
+#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #ifdef HAVE_MLIB
 #include "yuv2rgb_mlib.c"
diff --git a/postproc/yuv2rgb_altivec.c b/postproc/yuv2rgb_altivec.c
index 2ebe30a0e6..bb1ebeb9b6 100644
--- a/postproc/yuv2rgb_altivec.c
+++ b/postproc/yuv2rgb_altivec.c
@@ -71,8 +71,8 @@
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "../mangle.h"
-#include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "mangle.h"
+#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #undef PROFILE_THE_BEAST
 #undef INC_SCALING
diff --git a/postproc/yuv2rgb_mlib.c b/postproc/yuv2rgb_mlib.c
index 0b0fb95951..b19c2a5d18 100644
--- a/postproc/yuv2rgb_mlib.c
+++ b/postproc/yuv2rgb_mlib.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 #include "swscale.h"
 
 static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,