[SCM] libav/experimental: Unify include paths, -I.. is in CFLAGS.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b2d374c9587e48b9861e346bce4b12d96308c78d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Nov 14 00:30:37 2005 +0000

    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 0e5fe4a..df54a7e 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 c9af67e..94289a4 100644
--- a/postproc/rgb2rgb.c
+++ b/postproc/rgb2rgb.c
@@ -8,13 +8,13 @@
  *  palette & yuv & runtime cpu stuff by Michael (michaelni at 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 ce245b0..3509eca 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 75599ec..941a486 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 fff8732..9a8a9b4 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 d8a31ef..63e465f 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 2ebe30a..bb1ebeb 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 0b0fb95..b19c2a5 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, 

-- 
Libav/FFmpeg packaging