diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2006-09-09 22:53:44 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-09-09 22:53:44 +0000 |
| commit | d120e4026d685fd770ac211191d72757b112a556 (patch) | |
| tree | 40c474dc134dd8ba13d1674a5bec8a2d7b78c02d /libavcodec/vp6.c | |
| parent | 9a8e6f87080bba32a8801ff7b690d8032df75004 (diff) | |
| download | ffmpeg-d120e4026d685fd770ac211191d72757b112a556.tar.gz | |
rename vector to vect to avoid clash with Apple gcc
Originally committed as revision 6217 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index bf528f826a..3767583965 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -195,14 +195,14 @@ static void vp6_parse_coeff_models(vp56_context_t *s) 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); } -static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vector) +static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect) { vp56_range_coder_t *c = &s->c; int comp; - *vector = (vp56_mv_t) {0,0}; + *vect = (vp56_mv_t) {0,0}; if (s->vector_candidate_pos < 2) - *vector = s->vector_candidate[0]; + *vect = s->vector_candidate[0]; for (comp=0; comp<2; comp++) { int i, delta = 0; @@ -226,9 +226,9 @@ static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vector) delta = -delta; if (!comp) - vector->x += delta; + vect->x += delta; else - vector->y += delta; + vect->y += delta; } } |