Mercurial > libavcodec.hg
comparison vp6.c @ 3697:596e62da8f29 libavcodec
rename vector to vect to avoid clash with Apple gcc
author | aurel |
---|---|
date | Sat, 09 Sep 2006 22:53:44 +0000 |
parents | 6795c9e5f983 |
children | c8c591fe26f8 |
comparison
equal
deleted
inserted
replaced
3696:e2aafe2aa2df | 3697:596e62da8f29 |
---|---|
193 for (ctx=0; ctx<3; ctx++) | 193 for (ctx=0; ctx<3; ctx++) |
194 for (node=0; node<5; node++) | 194 for (node=0; node<5; node++) |
195 s->coeff_model_dcct[pt][ctx][node] = clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255); | 195 s->coeff_model_dcct[pt][ctx][node] = clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255); |
196 } | 196 } |
197 | 197 |
198 static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vector) | 198 static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect) |
199 { | 199 { |
200 vp56_range_coder_t *c = &s->c; | 200 vp56_range_coder_t *c = &s->c; |
201 int comp; | 201 int comp; |
202 | 202 |
203 *vector = (vp56_mv_t) {0,0}; | 203 *vect = (vp56_mv_t) {0,0}; |
204 if (s->vector_candidate_pos < 2) | 204 if (s->vector_candidate_pos < 2) |
205 *vector = s->vector_candidate[0]; | 205 *vect = s->vector_candidate[0]; |
206 | 206 |
207 for (comp=0; comp<2; comp++) { | 207 for (comp=0; comp<2; comp++) { |
208 int i, delta = 0; | 208 int i, delta = 0; |
209 | 209 |
210 if (vp56_rac_get_prob(c, s->vector_model_dct[comp])) { | 210 if (vp56_rac_get_prob(c, s->vector_model_dct[comp])) { |
224 | 224 |
225 if (delta && vp56_rac_get_prob(c, s->vector_model_sig[comp])) | 225 if (delta && vp56_rac_get_prob(c, s->vector_model_sig[comp])) |
226 delta = -delta; | 226 delta = -delta; |
227 | 227 |
228 if (!comp) | 228 if (!comp) |
229 vector->x += delta; | 229 vect->x += delta; |
230 else | 230 else |
231 vector->y += delta; | 231 vect->y += delta; |
232 } | 232 } |
233 } | 233 } |
234 | 234 |
235 static void vp6_parse_coeff(vp56_context_t *s) | 235 static void vp6_parse_coeff(vp56_context_t *s) |
236 { | 236 { |