generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

motion_est: fix some signed overflows

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e708afd3c0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mans Rullgard
2011-10-08 13:52:44 +01:00
committed by Michael Niedermayer
parent 37ce6ba425
commit 4ba0e03759
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/motion_est.c
View File

@@ -1040,7 +1040,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
/* intra / predictive decision */ /* intra / predictive decision */
pix = c->src[0][0]; pix = c->src[0][0];
sum = s->dsp.pix_sum(pix, s->linesize); sum = s->dsp.pix_sum(pix, s->linesize);
varc = s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500; varc = s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)sum*sum)>>8) + 500;
pic->mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; pic->mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8;
pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8; pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8;
@@ -1202,7 +1202,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
if((c->avctx->mb_cmp&0xFF)==FF_CMP_SSE){ if((c->avctx->mb_cmp&0xFF)==FF_CMP_SSE){
intra_score= varc - 500; intra_score= varc - 500;
}else{ }else{
int mean= (sum+128)>>8; unsigned mean = (sum+128)>>8;
mean*= 0x01010101; mean*= 0x01010101;
for(i=0; i<16; i++){ for(i=0; i<16; i++){