diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-15 13:51:57 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:07:14 +0200 |
| commit | d1b357d78b62e8560da1cd52326f6f5031a2cc69 (patch) | |
| tree | e6e6494b9005802d4fc9eb38571bc1f36799f255 /libavcodec/vp6.c | |
| parent | 27cfdc3e4fcf0ab490cce6bf961af9180b21ac6b (diff) | |
| download | ffmpeg-d1b357d78b62e8560da1cd52326f6f5031a2cc69.tar.gz | |
vp56: Add ff_ prefix to nonstatic symbols
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 59bbca79bd..75863a9b67 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -178,7 +178,7 @@ static void vp6_default_models_init(VP56Context *s) model->vector_sig[0] = 0x80; model->vector_sig[1] = 0x80; - memcpy(model->mb_types_stats, vp56_def_mb_types_stats, sizeof(model->mb_types_stats)); + memcpy(model->mb_types_stats, ff_vp56_def_mb_types_stats, sizeof(model->mb_types_stats)); memcpy(model->vector_fdv, vp6_def_fdv_vector_model, sizeof(model->vector_fdv)); memcpy(model->vector_pdv, vp6_def_pdv_vector_model, sizeof(model->vector_pdv)); memcpy(model->coeff_runv, vp6_def_runv_coeff_model, sizeof(model->coeff_runv)); @@ -332,7 +332,7 @@ static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect) else delta |= 8; } else { - delta = vp56_rac_get_tree(c, vp56_pva_tree, + delta = vp56_rac_get_tree(c, ff_vp56_pva_tree, model->vector_pdv[comp]); } @@ -400,7 +400,7 @@ static void vp6_parse_coeff_huffman(VP56Context *s) s->nb_null[1][pt] = vp6_get_nb_null(s); break; } else { - int coeff2 = vp56_coeff_bias[coeff]; + int coeff2 = ff_vp56_coeff_bias[coeff]; if (coeff > 4) coeff2 += get_bits(&s->gb, coeff <= 9 ? coeff - 4 : 11); ct = 1 + (coeff2 > 1); @@ -437,7 +437,7 @@ static void vp6_parse_coeff(VP56Context *s) if (b > 3) pt = 1; - ctx = s->left_block[vp56_b6to4[b]].not_null_dc + ctx = s->left_block[ff_vp56_b6to4[b]].not_null_dc + s->above_blocks[s->above_block_idx[b]].not_null_dc; model1 = model->coeff_dccv[pt]; model2 = model->coeff_dcct[pt][ctx]; @@ -448,10 +448,10 @@ static void vp6_parse_coeff(VP56Context *s) /* parse a coeff */ if (vp56_rac_get_prob(c, model2[2])) { if (vp56_rac_get_prob(c, model2[3])) { - idx = vp56_rac_get_tree(c, vp56_pc_tree, model1); - coeff = vp56_coeff_bias[idx+5]; - for (i=vp56_coeff_bit_length[idx]; i>=0; i--) - coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i; + idx = vp56_rac_get_tree(c, ff_vp56_pc_tree, model1); + coeff = ff_vp56_coeff_bias[idx+5]; + for (i=ff_vp56_coeff_bit_length[idx]; i>=0; i--) + coeff += vp56_rac_get_prob(c, ff_vp56_coeff_parse_table[idx][i]) << i; } else { if (vp56_rac_get_prob(c, model2[4])) coeff = 3 + vp56_rac_get_prob(c, model1[5]); @@ -491,7 +491,7 @@ static void vp6_parse_coeff(VP56Context *s) model1 = model2 = model->coeff_ract[pt][ct][cg]; } - s->left_block[vp56_b6to4[b]].not_null_dc = + s->left_block[ff_vp56_b6to4[b]].not_null_dc = s->above_blocks[s->above_block_idx[b]].not_null_dc = !!s->block_coeff[b][0]; } } |