Commit b2d374c9 authored by Diego Biurrun's avatar Diego Biurrun

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

Originally committed as revision 16986 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
parent 52ceae06
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "swscale.h" #include "swscale.h"
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "../cpudetect.h" #include "cpudetect.h"
#define SIZE 1000 #define SIZE 1000
#define srcByte 0x55 #define srcByte 0x55
......
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
* palette & yuv & runtime cpu stuff by Michael (michaelni@gmx.at) (under GPL) * palette & yuv & runtime cpu stuff by Michael (michaelni@gmx.at) (under GPL)
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "../config.h" #include "config.h"
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "swscale.h" #include "swscale.h"
#include "../cpudetect.h" #include "cpudetect.h"
#include "../mangle.h" #include "mangle.h"
#include "../bswap.h" #include "bswap.h"
#include "../libvo/fastmemcpy.h" #include "libvo/fastmemcpy.h"
#define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit #define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdarg.h> #include <stdarg.h>
#include "../config.h" #include "config.h"
#include "swscale.h" #include "swscale.h"
#include "../libvo/img_format.h" #include "libvo/img_format.h"
static int testFormat[]={ static int testFormat[]={
IMGFMT_YVU9, IMGFMT_YVU9,
......
...@@ -54,8 +54,8 @@ untested special converters ...@@ -54,8 +54,8 @@ untested special converters
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include "../config.h" #include "config.h"
#include "../mangle.h" #include "mangle.h"
#include <assert.h> #include <assert.h>
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>
...@@ -70,11 +70,11 @@ untested special converters ...@@ -70,11 +70,11 @@ untested special converters
#endif #endif
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
#include "../cpudetect.h" #include "cpudetect.h"
#include "../bswap.h" #include "bswap.h"
#include "../libvo/img_format.h" #include "libvo/img_format.h"
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "../libvo/fastmemcpy.h" #include "libvo/fastmemcpy.h"
#undef MOVNTQ #undef MOVNTQ
#undef PAVGB #undef PAVGB
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define AVV(x...) {x} #define AVV(x...) {x}
#endif #endif
#include "../mp_msg.h" #include "mp_msg.h"
#define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args ) #define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
#define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args ) #define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args )
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
#include "../mangle.h" #include "mangle.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
#ifdef HAVE_MLIB #ifdef HAVE_MLIB
#include "yuv2rgb_mlib.c" #include "yuv2rgb_mlib.c"
......
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
#include "rgb2rgb.h" #include "rgb2rgb.h"
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
#include "../mangle.h" #include "mangle.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
#undef PROFILE_THE_BEAST #undef PROFILE_THE_BEAST
#undef INC_SCALING #undef INC_SCALING
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.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" #include "swscale.h"
static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment