@@ -87,7 +87,7 @@ static int vp5_adjust(int v, int t)

 static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int comp, di;

     for (comp=0; comp<2; comp++) {

@@ -111,7 +111,7 @@ static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)

 static void vp5_parse_vector_models(VP56Context *s)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int comp, node;

     for (comp=0; comp<2; comp++) {

@@ -134,7 +134,7 @@ static void vp5_parse_vector_models(VP56Context *s)

 static void vp5_parse_coeff_models(VP56Context *s)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     uint8_t def_prob[11];

     int node, cg, ctx;

     int ct;    /* code type */

@@ -180,7 +180,7 @@ static void vp5_parse_coeff_models(VP56Context *s)

 static void vp5_parse_coeff(VP56Context *s)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     uint8_t *permute = s->scantable.permutated;

     uint8_t *model1, *model2;

     int coeff, sign, coeff_idx;

@@ -252,7 +252,7 @@ static void vp5_parse_coeff(VP56Context *s)

 static void vp5_default_models_init(VP56Context *s)

 {

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int i;

     for (i=0; i<2; i++) {

@@ -76,7 +76,7 @@ static int vp56_get_vectors_predictors(VP56Context *s, int row, int col,

 static void vp56_parse_mb_type_models(VP56Context *s)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int i, ctx, type;

     for (ctx=0; ctx<3; ctx++) {

@@ -84,7 +84,7 @@ typedef struct {

     uint8_t coeff_runv[2][14];       /* run value (vp6 only) */

     uint8_t mb_type[3][10][10];      /* model for decoding MB type */

     uint8_t mb_types_stats[3][10][2];/* contextual, next MB type stats */

-} Vp56Model;

+} VP56Model;

 struct vp56_context {

     AVCodecContext *avctx;

@@ -155,8 +155,8 @@ struct vp56_context {

     VP56ParseCoeffModels parse_coeff_models;

     VP56ParseHeader parse_header;

-    Vp56Model *modelp;

-    Vp56Model models[2];

+    VP56Model *modelp;

+    VP56Model models[2];

     /* huffman decoding */

     int use_huffman;

@@ -164,7 +164,7 @@ static void vp6_coeff_order_table_init(VP56Context *s)

 static void vp6_default_models_init(VP56Context *s)

 {

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     model->vector_dct[0] = 0xA2;

     model->vector_dct[1] = 0xA4;

@@ -183,7 +183,7 @@ static void vp6_default_models_init(VP56Context *s)

 static void vp6_parse_vector_models(VP56Context *s)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int comp, node;

     for (comp=0; comp<2; comp++) {

@@ -234,7 +234,7 @@ static void vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[],

 static void vp6_parse_coeff_models(VP56Context *s)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int def_prob[11];

     int node, cg, ctx, pos;

     int ct;    /* code type */

@@ -299,7 +299,7 @@ static void vp6_parse_coeff_models(VP56Context *s)

 static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect)

 {

     VP56RangeCoder *c = &s->c;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     int comp;

     *vect = (VP56mv) {0,0};

@@ -352,7 +352,7 @@ static unsigned vp6_get_nb_null(VP56Context *s)

 static void vp6_parse_coeff_huffman(VP56Context *s)

 {

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     uint8_t *permute = s->scantable.permutated;

     VLC *vlc_coeff;

     int coeff, sign, coeff_idx;

@@ -408,7 +408,7 @@ static void vp6_parse_coeff_huffman(VP56Context *s)

 static void vp6_parse_coeff(VP56Context *s)

 {

     VP56RangeCoder *c = s->ccp;

-    Vp56Model *model = s->modelp;

+    VP56Model *model = s->modelp;

     uint8_t *permute = s->scantable.permutated;

     uint8_t *model1, *model2, *model3;

     int coeff, sign, coeff_idx;