Originally committed as revision 19437 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscaletags/v0.5
@@ -23,7 +23,7 @@ | |||||
#include <stdarg.h> | #include <stdarg.h> | ||||
#include "swscale.h" | #include "swscale.h" | ||||
#include "img_format.h" | |||||
#include "libmpcodecs/img_format.h" | |||||
static int testFormat[]={ | static int testFormat[]={ | ||||
IMGFMT_YVU9, | IMGFMT_YVU9, | ||||
@@ -71,7 +71,7 @@ untested special converters | |||||
#include "swscale_internal.h" | #include "swscale_internal.h" | ||||
#include "x86_cpu.h" | #include "x86_cpu.h" | ||||
#include "bswap.h" | #include "bswap.h" | ||||
#include "img_format.h" | |||||
#include "libmpcodecs/img_format.h" | |||||
#include "rgb2rgb.h" | #include "rgb2rgb.h" | ||||
#ifdef USE_FASTMEMCPY | #ifdef USE_FASTMEMCPY | ||||
#include "libvo/fastmemcpy.h" | #include "libvo/fastmemcpy.h" | ||||
@@ -39,7 +39,7 @@ | |||||
#include "rgb2rgb.h" | #include "rgb2rgb.h" | ||||
#include "swscale.h" | #include "swscale.h" | ||||
#include "swscale_internal.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 | #ifdef HAVE_MLIB | ||||
#include "yuv2rgb_mlib.c" | #include "yuv2rgb_mlib.c" | ||||
@@ -74,7 +74,7 @@ | |||||
#include "rgb2rgb.h" | #include "rgb2rgb.h" | ||||
#include "swscale.h" | #include "swscale.h" | ||||
#include "swscale_internal.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 PROFILE_THE_BEAST | ||||
#undef INC_SCALING | #undef INC_SCALING | ||||
@@ -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 "libmpcodecs/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, | ||||