diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-27 17:40:57 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-27 17:40:57 +0200 |
| commit | c1b80dcbbb34d63df65c0f52c0bede66dfa225e8 (patch) | |
| tree | 2b929ffa6f2896bdee81729ceab2b9651c62055f /libswscale | |
| parent | a76f59b0390a408de0a666cb1edfc578b734596a (diff) | |
| parent | 4f6c6ba61a1fc213c7356b9ae1b9467f177a67a5 (diff) | |
| download | mpv-c1b80dcbbb34d63df65c0f52c0bede66dfa225e8.tar.bz2 mpv-c1b80dcbbb34d63df65c0f52c0bede66dfa225e8.tar.xz | |
Merge svn changes up to r28204
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 6 | ||||
| -rw-r--r-- | libswscale/yuv2rgb_bfin.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 577d09333e..dabc7c4962 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -949,11 +949,11 @@ static inline void yuv2rgbXinC_full(SwsContext *c, int16_t *lumFilter, int16_t * #define COMPILE_C #endif -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC #if (defined (HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL) #define COMPILE_ALTIVEC #endif //HAVE_ALTIVEC -#endif //ARCH_POWERPC +#endif //ARCH_PPC #if defined(ARCH_X86) @@ -1628,7 +1628,7 @@ static SwsFunc getSwsFunc(int flags){ return swScale_C; #else -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC if (flags & SWS_CPU_CAPS_ALTIVEC) return swScale_altivec; else diff --git a/libswscale/yuv2rgb_bfin.c b/libswscale/yuv2rgb_bfin.c index a473652382..58cc5b6a35 100644 --- a/libswscale/yuv2rgb_bfin.c +++ b/libswscale/yuv2rgb_bfin.c @@ -47,8 +47,8 @@ void ff_bfin_yuv2rgb565_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb24_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, int w, uint32_t *coeffs) L1CODE; -typedef void (* ltransform_t)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, - int w, uint32_t *coeffs); +typedef void (* ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, + int w, uint32_t *coeffs); static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks) @@ -92,7 +92,7 @@ static int core_yuv420_rgb (SwsContext *c, uint8_t **in, int *instrides, int srcSliceY, int srcSliceH, uint8_t **oplanes, int *outstrides, - ltransform_t lcscf, int rgb, int masks) + ltransform lcscf, int rgb, int masks) { uint8_t *py,*pu,*pv,*op; int w = instrides[0]; |