From db3924f1fd104caa669dabdb0869677349b80f99 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 18 Aug 2006 13:58:03 +0000 Subject: [PATCH] Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h. Originally committed as revision 19437 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale-example.c | 2 +- libswscale/swscale.c | 2 +- libswscale/yuv2rgb.c | 2 +- libswscale/yuv2rgb_altivec.c | 2 +- libswscale/yuv2rgb_mlib.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c index bda9aa3..3164377 100644 --- a/libswscale/swscale-example.c +++ b/libswscale/swscale-example.c @@ -23,7 +23,7 @@ #include #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 5b1a78f..18ae7ae 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 8d9a2ac..8c116ba 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 78662f2..a7af8f1 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 b19c2a5..69c4ad3 100644 --- a/libswscale/yuv2rgb_mlib.c +++ b/libswscale/yuv2rgb_mlib.c @@ -30,7 +30,7 @@ #include #include -#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, -- 2.7.4