virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

overflow fix

Browse Source 
Originally committed as revision 3685 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-11-16 13:40:56 +00:00
parent dffcdbb5f6
commit 096c3b7e90
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/motion_est.c
View File

@ -1017,7 +1017,7 @@ static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int
if(p_type && USES_LIST(mb_type, 1)){ if(p_type && USES_LIST(mb_type, 1)){
av_log(c->avctx, AV_LOG_ERROR, "backward motion vector in P frame\n"); av_log(c->avctx, AV_LOG_ERROR, "backward motion vector in P frame\n");
return INT_MAX; return INT_MAX/4;
} }
assert(IS_INTRA(mb_type) || USES_LIST(mb_type,0) || USES_LIST(mb_type,1)); assert(IS_INTRA(mb_type) || USES_LIST(mb_type,0) || USES_LIST(mb_type,1));
@ -1035,7 +1035,7 @@ static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int
if(!(s->flags & CODEC_FLAG_INTERLACED_ME)){ if(!(s->flags & CODEC_FLAG_INTERLACED_ME)){
av_log(c->avctx, AV_LOG_ERROR, "Interlaced macroblock selected but interlaced motion estimation disabled\n"); av_log(c->avctx, AV_LOG_ERROR, "Interlaced macroblock selected but interlaced motion estimation disabled\n");
return INT_MAX; return INT_MAX/4;
} }
if(USES_LIST(mb_type, 0)){ if(USES_LIST(mb_type, 0)){
@ -1096,7 +1096,7 @@ static inline int check_input_motion(MpegEncContext * s, int mb_x, int mb_y, int
}else if(IS_8X8(mb_type)){ }else if(IS_8X8(mb_type)){
if(!(s->flags & CODEC_FLAG_4MV)){ if(!(s->flags & CODEC_FLAG_4MV)){
av_log(c->avctx, AV_LOG_ERROR, "4MV macroblock selected but 4MV encoding disabled\n"); av_log(c->avctx, AV_LOG_ERROR, "4MV macroblock selected but 4MV encoding disabled\n");
return INT_MAX; return INT_MAX/4;
} }
cmpf= s->dsp.sse[1]; cmpf= s->dsp.sse[1];
chroma_cmpf= s->dsp.sse[1]; chroma_cmpf= s->dsp.sse[1];