diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-05-26 18:57:26 +0200 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-28 10:03:37 -0400 |
| commit | b8e893399ff8755721dc117695ec5ff183c1e07b (patch) | |
| tree | 9fb1961a9d5ae9f2d1c4e00fd170d2f56d97e477 /libswscale/ppc | |
| parent | 7d8c17b5f62bc14d5f7c7c792630b23240b47eec (diff) | |
| download | ffmpeg-b8e893399ff8755721dc117695ec5ff183c1e07b.tar.gz | |
sws: replace all long with int.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libswscale/ppc')
| -rw-r--r-- | libswscale/ppc/swscale_altivec_template.c | 4 | ||||
| -rw-r--r-- | libswscale/ppc/swscale_template.c | 4 | ||||
| -rw-r--r-- | libswscale/ppc/yuv2rgb_altivec.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libswscale/ppc/swscale_altivec_template.c b/libswscale/ppc/swscale_altivec_template.c index eee7bdd0a5..21e3b4eafb 100644 --- a/libswscale/ppc/swscale_altivec_template.c +++ b/libswscale/ppc/swscale_altivec_template.c @@ -29,13 +29,13 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW) register int i; vector unsigned int altivec_vectorShiftInt19 = vec_add(vec_splat_u32(10), vec_splat_u32(9)); - if ((unsigned long)dest % 16) { + if ((unsigned int)dest % 16) { /* badly aligned store, we force store alignment */ /* and will handle load misalignment on val w/ vec_perm */ vector unsigned char perm1; vector signed int v1; for (i = 0 ; (i < dstW) && - (((unsigned long)dest + i) % 16) ; i++) { + (((unsigned int)dest + i) % 16) ; i++) { int t = val[i] >> 19; dest[i] = (t < 0) ? 0 : ((t > 255) ? 255 : t); } diff --git a/libswscale/ppc/swscale_template.c b/libswscale/ppc/swscale_template.c index 0fe97a1114..ca6777144d 100644 --- a/libswscale/ppc/swscale_template.c +++ b/libswscale/ppc/swscale_template.c @@ -30,7 +30,7 @@ static inline void RENAME(yuv2yuvX)(SwsContext *c, const int16_t *lumFilter, const int16_t **chrVSrc, int chrFilterSize, const int16_t **alpSrc, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, - uint8_t *aDest, long dstW, long chrDstW) + uint8_t *aDest, int dstW, int chrDstW) { yuv2yuvX_altivec_real(lumFilter, lumSrc, lumFilterSize, chrFilter, chrUSrc, chrVSrc, chrFilterSize, @@ -45,7 +45,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, const int16_t *lumFilter, const int16_t *chrFilter, const int16_t **chrUSrc, const int16_t **chrVSrc, int chrFilterSize, const int16_t **alpSrc, uint8_t *dest, - long dstW, long dstY) + int dstW, int dstY) { /* The following list of supported dstFormat values should match what's found in the body of ff_yuv2packedX_altivec() */ diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index abd49c9e96..0cc0d3084d 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -793,7 +793,7 @@ ff_yuv2packedX_altivec(SwsContext *c, const int16_t *lumFilter, vector signed short RND = vec_splat_s16(1<<3); vector unsigned short SCL = vec_splat_u16(4); - DECLARE_ALIGNED(16, unsigned long, scratch)[16]; + DECLARE_ALIGNED(16, unsigned int, scratch)[16]; vector signed short *YCoeffs, *CCoeffs; |