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

Originally committed as revision 16986 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

diff --git a/postproc/cs_test.c b/postproc/cs_test.c
index 0e5fe4a26eb4a6e399233bae1523eabda6fa5153..df54a7ee0b3845155072357776f48394cda492ae 100644 (file)
--- 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 c9af67e74c1438f6e915e2444e01b5a16bc2fd41..94289a43bca74371c8283859a4782241d24f0f58 100644 (file)
--- 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 ce245b091bf9ef74e30e9b4b4d651a4018bebf99..3509eca6bfa3b91f2ab10d34570b850a66016347 100644 (file)
--- 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 75599ec900ed2d3a51ba05404f86712ec281950f..941a486b0dc8e0c7b4501247a15cb13ed8ea1ffb 100644 (file)
--- 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 fff873297c53df86ca0691de1490dba35ad3a19d..9a8a9b4b35cfd64500dbfaf823500dfbde19bbd0 100644 (file)
--- 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 d8a31ef93a25d1c6b2dc3c3cf1f0af862fedfd75..63e465fb844b5015ffdd7a656458150033781429 100644 (file)
--- 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 2ebe30a0e64f856ba8334a4a8fb1f44f0b845de1..bb1ebeb9b696bf243224167f9220e972d09e213a 100644 (file)
--- 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 0b0fb95951199e43427d69fe296117c89dac4a46..b19c2a5d1893a7e19cbd124a1744eb0fc39e4ea4 100644 (file)
--- 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,