aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-03-21 23:52:34 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-03-21 23:52:34 +0000
commit3d99e069e432682088e20be24aa276c7cf59bceb (patch)
treedcb04ab372b2b4d3821accc0711eabfa57eb3654
parent870a4adbb7d829851ac54f55990e97a4738a6fe6 (diff)
downloadffmpeg-3d99e069e432682088e20be24aa276c7cf59bceb.tar.gz
10l (C code was buggy and untested)
Originally committed as revision 29030 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
-rw-r--r--libswscale/rgb2rgb_template.c11
1 files 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++;
}
}