Mercurial > libavcodec.hg
diff error_resilience.c @ 847:f3c369b8ddca libavcodec
reversing header game
MIN/MAX -> FFMIN/FFMAX
| author | michaelni |
|---|---|
| date | Sun, 10 Nov 2002 11:46:59 +0000 |
| parents | 25d7fb7c89be |
| children | eacc2dd8fd9d |
line wrap: on
line diff
--- a/error_resilience.c Sun Nov 10 11:24:27 2002 +0000 +++ b/error_resilience.c Sun Nov 10 11:46:59 2002 +0000 @@ -209,7 +209,7 @@ c= dst[offset + 9 + y*stride] - dst[offset + 8 + y*stride]; d= ABS(b) - ((ABS(a) + ABS(c) + 1)>>1); - d= MAX(d, 0); + d= FFMAX(d, 0); if(b<0) d= -d; if(d==0) continue; @@ -269,7 +269,7 @@ c= dst[offset + x + 9*stride] - dst[offset + x + 8*stride]; d= ABS(b) - ((ABS(a) + ABS(c)+1)>>1); - d= MAX(d, 0); + d= FFMAX(d, 0); if(b<0) d= -d; if(d==0) continue; @@ -430,10 +430,10 @@ min_x=min_y=max_x=max_y=0; } for(j=0; j<pred_count; j++){ - max_x= MAX(max_x, mv_predictor[j][0]); - max_y= MAX(max_y, mv_predictor[j][1]); - min_x= MIN(min_x, mv_predictor[j][0]); - min_y= MIN(min_y, mv_predictor[j][1]); + max_x= FFMAX(max_x, mv_predictor[j][0]); + max_y= FFMAX(max_y, mv_predictor[j][1]); + min_x= FFMIN(min_x, mv_predictor[j][0]); + min_y= FFMIN(min_y, mv_predictor[j][1]); } mv_predictor[pred_count+1][0] = sum_x - max_x - min_x; mv_predictor[pred_count+1][1] = sum_y - max_y - min_y; @@ -538,7 +538,7 @@ if(undamaged_count < 5) return 0; //allmost all MBs damaged -> use temporal prediction - skip_amount= MAX(undamaged_count/50, 1); //check only upto 50 MBs + skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs is_intra_likely=0; j=0;