comparison h263.c @ 847:f3c369b8ddca libavcodec

reversing header game MIN/MAX -> FFMIN/FFMAX
author michaelni
date Sun, 10 Nov 2002 11:46:59 +0000
parents f5f2e162331c
children eacc2dd8fd9d
comparison
equal deleted inserted replaced
846:ade627a74709 847:f3c369b8ddca
2202 return 16; 2202 return 16;
2203 case P_TYPE: 2203 case P_TYPE:
2204 case S_TYPE: 2204 case S_TYPE:
2205 return s->f_code+15; 2205 return s->f_code+15;
2206 case B_TYPE: 2206 case B_TYPE:
2207 return MAX(MAX(s->f_code, s->b_code)+15, 17); 2207 return FFMAX(FFMAX(s->f_code, s->b_code)+15, 17);
2208 default: 2208 default:
2209 return -1; 2209 return -1;
2210 } 2210 }
2211 } 2211 }
2212 2212
3979 3979
3980 s->sprite_shift[0]= alpha+rho; 3980 s->sprite_shift[0]= alpha+rho;
3981 s->sprite_shift[1]= alpha+rho+2; 3981 s->sprite_shift[1]= alpha+rho+2;
3982 break; 3982 break;
3983 case 3: 3983 case 3:
3984 min_ab= MIN(alpha, beta); 3984 min_ab= FFMIN(alpha, beta);
3985 w3= w2>>min_ab; 3985 w3= w2>>min_ab;
3986 h3= h2>>min_ab; 3986 h3= h2>>min_ab;
3987 s->sprite_offset[0][0]= (sprite_ref[0][0]<<(alpha+beta+rho-min_ab)) 3987 s->sprite_offset[0][0]= (sprite_ref[0][0]<<(alpha+beta+rho-min_ab))
3988 + (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-vop_ref[0][0]) 3988 + (-r*sprite_ref[0][0] + virtual_ref[0][0])*h3*(-vop_ref[0][0])
3989 + (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3*(-vop_ref[0][1]) 3989 + (-r*sprite_ref[0][0] + virtual_ref[1][0])*w3*(-vop_ref[0][1])