Mercurial > libavcodec.hg
diff vc1.c @ 4001:34fdffe98bd0 libavcodec
Rename ABS macro to FFABS.
| author | diego |
|---|---|
| date | Wed, 11 Oct 2006 23:17:58 +0000 |
| parents | c8c591fe26f8 |
| children | ec6d49d9c19d |
line wrap: on
line diff
--- a/vc1.c Wed Oct 11 21:34:15 2006 +0000 +++ b/vc1.c Wed Oct 11 23:17:58 2006 +0000 @@ -1950,9 +1950,9 @@ /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) { if(is_intra[xy - wrap]) - sum = ABS(px) + ABS(py); + sum = FFABS(px) + FFABS(py); else - sum = ABS(px - A[0]) + ABS(py - A[1]); + sum = FFABS(px - A[0]) + FFABS(py - A[1]); if(sum > 32) { if(get_bits1(&s->gb)) { px = A[0]; @@ -1963,9 +1963,9 @@ } } else { if(is_intra[xy - 1]) - sum = ABS(px) + ABS(py); + sum = FFABS(px) + FFABS(py); else - sum = ABS(px - C[0]) + ABS(py - C[1]); + sum = FFABS(px - C[0]) + FFABS(py - C[1]); if(sum > 32) { if(get_bits1(&s->gb)) { px = A[0]; @@ -2218,9 +2218,9 @@ /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ if(0 && !s->first_slice_line && s->mb_x) { if(is_intra[xy - wrap]) - sum = ABS(px) + ABS(py); + sum = FFABS(px) + FFABS(py); else - sum = ABS(px - A[0]) + ABS(py - A[1]); + sum = FFABS(px - A[0]) + FFABS(py - A[1]); if(sum > 32) { if(get_bits1(&s->gb)) { px = A[0]; @@ -2231,9 +2231,9 @@ } } else { if(is_intra[xy - 2]) - sum = ABS(px) + ABS(py); + sum = FFABS(px) + FFABS(py); else - sum = ABS(px - C[0]) + ABS(py - C[1]); + sum = FFABS(px - C[0]) + FFABS(py - C[1]); if(sum > 32) { if(get_bits1(&s->gb)) { px = A[0]; @@ -2295,9 +2295,9 @@ /* Calculate hybrid prediction as specified in 8.3.5.3.5 */ if(0 && !s->first_slice_line && s->mb_x) { if(is_intra[xy - wrap]) - sum = ABS(px) + ABS(py); + sum = FFABS(px) + FFABS(py); else - sum = ABS(px - A[0]) + ABS(py - A[1]); + sum = FFABS(px - A[0]) + FFABS(py - A[1]); if(sum > 32) { if(get_bits1(&s->gb)) { px = A[0]; @@ -2308,9 +2308,9 @@ } } else { if(is_intra[xy - 2]) - sum = ABS(px) + ABS(py); + sum = FFABS(px) + FFABS(py); else - sum = ABS(px - C[0]) + ABS(py - C[1]); + sum = FFABS(px - C[0]) + FFABS(py - C[1]); if(sum > 32) { if(get_bits1(&s->gb)) { px = A[0];