virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

10l (segfault fix)

Browse Source 
Originally committed as revision 4769 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-12-23 19:05:48 +00:00
parent 316a2ec84c
commit d4f0c2fcc3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/motion_est.c
View File

@ -1646,14 +1646,17 @@ static inline int bidir_refine(MpegEncContext * s, int mb_x, int mb_y)
if(s->avctx->bidir_refine){ if(s->avctx->bidir_refine){
int score, end; int score, end;
#define CHECK_BIDIR(fx,fy,bx,by)\ #define CHECK_BIDIR(fx,fy,bx,by)\
score= check_bidir_mv(s, motion_fx+fx, motion_fy+fy, motion_bx+bx, motion_by+by, pred_fx, pred_fy, pred_bx, pred_by, 0, 16);\ if( (fx<=0 || motion_fx+fx<=xmax) && (fy<=0 || motion_fy+fy<=ymax) && (bx<=0 || motion_bx+bx<=xmax) && (by<=0 || motion_by+by<=ymax)\
if(score < fbmin){\ &&(fx>=0 || motion_fx+fx>=xmin) && (fy>=0 || motion_fy+fy>=ymin) && (bx>=0 || motion_bx+bx>=xmin) && (by>=0 || motion_by+by>=ymin)){\
fbmin= score;\ score= check_bidir_mv(s, motion_fx+fx, motion_fy+fy, motion_bx+bx, motion_by+by, pred_fx, pred_fy, pred_bx, pred_by, 0, 16);\
motion_fx+=fx;\ if(score < fbmin){\
motion_fy+=fy;\ fbmin= score;\
motion_bx+=bx;\ motion_fx+=fx;\
motion_by+=by;\ motion_fy+=fy;\
end=0;\ motion_bx+=bx;\
motion_by+=by;\
end=0;\
}\
} }
#define CHECK_BIDIR2(a,b,c,d)\ #define CHECK_BIDIR2(a,b,c,d)\
CHECK_BIDIR(a,b,c,d)\ CHECK_BIDIR(a,b,c,d)\
@ -1668,10 +1671,6 @@ CHECK_BIDIR2(d,a,b,c)
do{ do{
end=1; end=1;
if( motion_fx >= xmax || motion_bx >= xmax || motion_fx <= xmin || motion_bx <= xmin
|| motion_fy >= ymax || motion_by >= ymax || motion_fy <= ymin || motion_by <= ymin)
break;
CHECK_BIDIRR( 0, 0, 0, 1) CHECK_BIDIRR( 0, 0, 0, 1)
if(s->avctx->bidir_refine > 1){ if(s->avctx->bidir_refine > 1){
CHECK_BIDIRR( 0, 0, 1, 1) CHECK_BIDIRR( 0, 0, 1, 1)