aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2006-12-11 10:52:18 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-12-11 10:52:18 +0000
commitec4e0056ef34e965acce682609f942063f87728d (patch)
tree2d71344f518d4866727fd91ff226a65c07f42a71
parent895bf49961b7531e0621ffef18504666ae1f839d (diff)
downloadffmpeg-ec4e0056ef34e965acce682609f942063f87728d.tar.gz
GCC 3.3 compile fix
Originally committed as revision 7277 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/ppc/h264_altivec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c
index febb2c8973..bac620e82a 100644
--- a/libavcodec/ppc/h264_altivec.c
+++ b/libavcodec/ppc/h264_altivec.c
@@ -464,7 +464,7 @@ static inline void avg_pixels16_l2_altivec( uint8_t * dst, const uint8_t * src1,
vec_u8_t lv = vec_ld( 7, dest ); \
vec_u8_t dstv = vec_perm( hv, lv, (vec_u8_t)perm_ldv ); \
vec_s16_t idct_sh6 = vec_sra(idctv, sixv); \
- vec_u16_t dst16 = vec_mergeh(zero_u8v, dstv); \
+ vec_u16_t dst16 = (vec_u16_t)vec_mergeh(zero_u8v, dstv); \
vec_s16_t idstsum = vec_adds(idct_sh6, (vec_s16_t)dst16); \
vec_u8_t idstsum8 = vec_packsu(zero_s16v, idstsum); \
vec_u8_t edgehv; \