diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
| commit | b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e (patch) | |
| tree | f502064c04d45369a01aa2722ac173b80301b8d3 /libavcodec/error_resilience.c | |
| parent | f11d3f23105f8c7e195990ab2c1728d3dd2f206f (diff) | |
| download | ffmpeg-b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e.tar.gz | |
reversing header game
MIN/MAX -> FFMIN/FFMAX
Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 84b7bb8a02..5023ff2f4a 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -209,7 +209,7 @@ static void h_block_filter(MpegEncContext *s, UINT8 *dst, int w, int h, int stri 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 @@ static void v_block_filter(MpegEncContext *s, UINT8 *dst, int w, int h, int stri 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 @@ int score_sum=0; 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 @@ static int is_intra_more_likely(MpegEncContext *s){ 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; |