aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-08-18 13:58:03 +0000
committerDiego Biurrun <diego@biurrun.de>2006-08-18 13:58:03 +0000
commitdb3924f1fd104caa669dabdb0869677349b80f99 (patch)
tree060ccfd07916bca80c074372323073e77f8a8041
parentf4bd289a04df659fc120b5a99632f7d4a6c57b1c (diff)
downloadffmpeg-db3924f1fd104caa669dabdb0869677349b80f99.tar.gz
Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
Originally committed as revision 19437 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
-rw-r--r--libswscale/swscale-example.c2
-rw-r--r--libswscale/swscale.c2
-rw-r--r--libswscale/yuv2rgb.c2
-rw-r--r--libswscale/yuv2rgb_altivec.c2
-rw-r--r--libswscale/yuv2rgb_mlib.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index bda9aa351e..3164377a0f 100644
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -23,7 +23,7 @@
#include <stdarg.h>
#include "swscale.h"
-#include "img_format.h"
+#include "libmpcodecs/img_format.h"
static int testFormat[]={
IMGFMT_YVU9,
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 5b1a78fdc8..18ae7ae352 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -71,7 +71,7 @@ untested special converters
#include "swscale_internal.h"
#include "x86_cpu.h"
#include "bswap.h"
-#include "img_format.h"
+#include "libmpcodecs/img_format.h"
#include "rgb2rgb.h"
#ifdef USE_FASTMEMCPY
#include "libvo/fastmemcpy.h"
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 8d9a2ac943..8c116ba0b7 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -39,7 +39,7 @@
#include "rgb2rgb.h"
#include "swscale.h"
#include "swscale_internal.h"
-#include "img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
#ifdef HAVE_MLIB
#include "yuv2rgb_mlib.c"
diff --git a/libswscale/yuv2rgb_altivec.c b/libswscale/yuv2rgb_altivec.c
index 78662f2f12..a7af8f11e0 100644
--- a/libswscale/yuv2rgb_altivec.c
+++ b/libswscale/yuv2rgb_altivec.c
@@ -74,7 +74,7 @@
#include "rgb2rgb.h"
#include "swscale.h"
#include "swscale_internal.h"
-#include "img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libmpcodecs/img_format.h" //FIXME try to reduce dependency of such stuff
#undef PROFILE_THE_BEAST
#undef INC_SCALING
diff --git a/libswscale/yuv2rgb_mlib.c b/libswscale/yuv2rgb_mlib.c
index b19c2a5d18..69c4ad303d 100644
--- a/libswscale/yuv2rgb_mlib.c
+++ b/libswscale/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 "libmpcodecs/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,