diff options
| author | David Conrad <lessen42@gmail.com> | 2009-01-06 10:44:45 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2009-01-06 10:44:45 +0000 |
| commit | 628653449ca57347017067306f8720b3d5a7a5be (patch) | |
| tree | 08a085ce36feff6113766b2f7a57b614f040ed2a /libavcodec/ppc/h264_altivec.c | |
| parent | 54b9095833fea1897a00fa08e8b46fd9d4c7b826 (diff) | |
| download | ffmpeg-628653449ca57347017067306f8720b3d5a7a5be.tar.gz | |
fix compilation with GCC-4.3+
patch by David Conrad + fix by myself
Originally committed as revision 16450 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ppc/h264_altivec.c')
| -rw-r--r-- | libavcodec/ppc/h264_altivec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c index fb9b9beb74..77eccd4116 100644 --- a/libavcodec/ppc/h264_altivec.c +++ b/libavcodec/ppc/h264_altivec.c @@ -953,8 +953,8 @@ void biweight_h264_WxH_altivec(uint8_t *dst, uint8_t *src, int stride, int log2_ temp[2] = weightd; temp[3] = offset; - vtemp = vec_ld(0, temp); - vlog2_denom = vec_splat(vtemp, 1); + vtemp = (vec_s16)vec_ld(0, temp); + vlog2_denom = (vec_u16)vec_splat(vtemp, 1); vweights = vec_splat(vtemp, 3); vweightd = vec_splat(vtemp, 5); voffset = vec_splat(vtemp, 7); @@ -965,10 +965,10 @@ void biweight_h264_WxH_altivec(uint8_t *dst, uint8_t *src, int stride, int log2_ vdst = vec_ld(0, dst); vsrc = vec_ld(0, src); - v0 = vec_mergeh(zero_u8v, vdst); - v1 = vec_mergel(zero_u8v, vdst); - v2 = vec_mergeh(zero_u8v, vsrc); - v3 = vec_mergel(zero_u8v, vsrc); + v0 = (vec_s16)vec_mergeh(zero_u8v, vdst); + v1 = (vec_s16)vec_mergel(zero_u8v, vdst); + v2 = (vec_s16)vec_mergeh(zero_u8v, vsrc); + v3 = (vec_s16)vec_mergel(zero_u8v, vsrc); if (w == 8) { if (src_aligned) |