From 3d99e069e432682088e20be24aa276c7cf59bceb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 Mar 2009 23:52:34 +0000 Subject: [PATCH] 10l (C code was buggy and untested) Originally committed as revision 29030 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/rgb2rgb_template.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 0b3b2aa8da..09a57cab81 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -2825,8 +2825,8 @@ static void RENAME(extract_even2avg)(const uint8_t *src0, const uint8_t *src1, u } #endif while(count<0){ - dst0[count]= src0[4*count+0]+src1[4*count+0]; - dst1[count]= src0[4*count+2]+src1[4*count+2]; + dst0[count]= (src0[4*count+0]+src1[4*count+0])>>1; + dst1[count]= (src0[4*count+2]+src1[4*count+2])>>1; count++; } } @@ -2872,6 +2872,7 @@ static void RENAME(extract_odd2)(const uint8_t *src, uint8_t *dst0, uint8_t *dst count -= 7; } #endif + src++; while(count<0){ dst0[count]= src[4*count+0]; dst1[count]= src[4*count+2]; @@ -2925,9 +2926,11 @@ static void RENAME(extract_odd2avg)(const uint8_t *src0, const uint8_t *src1, ui count -= 7; } #endif + src0++; + src1++; while(count<0){ - dst0[count]= src0[4*count+0]+src1[4*count+0]; - dst1[count]= src0[4*count+2]+src1[4*count+2]; + dst0[count]= (src0[4*count+0]+src1[4*count+0])>>1; + dst1[count]= (src0[4*count+2]+src1[4*count+2])>>1; count++; } }