diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2006-09-10 02:53:44 +0400 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-09-10 02:53:44 +0400 |
commit | d120e4026d685fd770ac211191d72757b112a556 (patch) | |
tree | 40c474dc134dd8ba13d1674a5bec8a2d7b78c02d | |
parent | 9a8e6f87080bba32a8801ff7b690d8032df75004 (diff) |
rename vector to vect to avoid clash with Apple gcc
Originally committed as revision 6217 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/vp5.c | 6 | ||||
-rw-r--r-- | libavcodec/vp56.c | 24 | ||||
-rw-r--r-- | libavcodec/vp6.c | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index f87e91d2a2..ce4703b26a 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -84,7 +84,7 @@ static int vp5_adjust(int v, int t) return v; } -static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vector) +static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect) { vp56_range_coder_t *c = &s->c; int comp, di; @@ -101,9 +101,9 @@ static void vp5_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vector) delta = (delta ^ -sign) + sign; } if (!comp) - vector->x = delta; + vect->x = delta; else - vector->y = delta; + vect->y = delta; } } diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 4a13adadaf..9acd7e7e2c 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -36,7 +36,7 @@ static int vp56_get_vectors_predictors(vp56_context_t *s, int row, int col, vp56_frame_t ref_frame) { int nb_pred = 0; - vp56_mv_t vector[2] = {{0,0}, {0,0}}; + vp56_mv_t vect[2] = {{0,0}, {0,0}}; int pos, offset; vp56_mv_t mvp; @@ -50,13 +50,13 @@ static int vp56_get_vectors_predictors(vp56_context_t *s, int row, int col, if (vp56_reference_frame[s->macroblocks[offset].type] != ref_frame) continue; - if ((s->macroblocks[offset].mv.x == vector[0].x && - s->macroblocks[offset].mv.y == vector[0].y) || + if ((s->macroblocks[offset].mv.x == vect[0].x && + s->macroblocks[offset].mv.y == vect[0].y) || (s->macroblocks[offset].mv.x == 0 && s->macroblocks[offset].mv.y == 0)) continue; - vector[nb_pred++] = s->macroblocks[offset].mv; + vect[nb_pred++] = s->macroblocks[offset].mv; if (nb_pred > 1) { nb_pred = -1; break; @@ -64,8 +64,8 @@ static int vp56_get_vectors_predictors(vp56_context_t *s, int row, int col, s->vector_candidate_pos = pos; } - s->vector_candidate[0] = vector[0]; - s->vector_candidate[1] = vector[1]; + s->vector_candidate[0] = vect[0]; + s->vector_candidate[1] = vect[1]; return nb_pred+1; } @@ -198,7 +198,7 @@ static void vp56_decode_4mv(vp56_context_t *s, int row, int col) static vp56_mb_t vp56_decode_mv(vp56_context_t *s, int row, int col) { - vp56_mv_t *mv, vector = {0,0}; + vp56_mv_t *mv, vect = {0,0}; int ctx, b; ctx = vp56_get_vectors_predictors(s, row, col, VP56_FRAME_PREVIOUS); @@ -225,14 +225,14 @@ static vp56_mb_t vp56_decode_mv(vp56_context_t *s, int row, int col) break; case VP56_MB_INTER_DELTA_PF: - s->parse_vector_adjustment(s, &vector); - mv = &vector; + s->parse_vector_adjustment(s, &vect); + mv = &vect; break; case VP56_MB_INTER_DELTA_GF: vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); - s->parse_vector_adjustment(s, &vector); - mv = &vector; + s->parse_vector_adjustment(s, &vect); + mv = &vect; break; case VP56_MB_INTER_4V: @@ -240,7 +240,7 @@ static vp56_mb_t vp56_decode_mv(vp56_context_t *s, int row, int col) return s->mb_type; default: - mv = &vector; + mv = &vect; break; } 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; } } |