Revision d887151d

View differences:

libavcodec/vp5.c
87 87
static void vp5_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
88 88
{
89 89
    VP56RangeCoder *c = &s->c;
90
    Vp56Model *model = s->modelp;
90
    VP56Model *model = s->modelp;
91 91
    int comp, di;
92 92

  
93 93
    for (comp=0; comp<2; comp++) {
......
111 111
static void vp5_parse_vector_models(VP56Context *s)
112 112
{
113 113
    VP56RangeCoder *c = &s->c;
114
    Vp56Model *model = s->modelp;
114
    VP56Model *model = s->modelp;
115 115
    int comp, node;
116 116

  
117 117
    for (comp=0; comp<2; comp++) {
......
134 134
static void vp5_parse_coeff_models(VP56Context *s)
135 135
{
136 136
    VP56RangeCoder *c = &s->c;
137
    Vp56Model *model = s->modelp;
137
    VP56Model *model = s->modelp;
138 138
    uint8_t def_prob[11];
139 139
    int node, cg, ctx;
140 140
    int ct;    /* code type */
......
180 180
static void vp5_parse_coeff(VP56Context *s)
181 181
{
182 182
    VP56RangeCoder *c = &s->c;
183
    Vp56Model *model = s->modelp;
183
    VP56Model *model = s->modelp;
184 184
    uint8_t *permute = s->scantable.permutated;
185 185
    uint8_t *model1, *model2;
186 186
    int coeff, sign, coeff_idx;
......
252 252

  
253 253
static void vp5_default_models_init(VP56Context *s)
254 254
{
255
    Vp56Model *model = s->modelp;
255
    VP56Model *model = s->modelp;
256 256
    int i;
257 257

  
258 258
    for (i=0; i<2; i++) {
libavcodec/vp56.c
76 76
static void vp56_parse_mb_type_models(VP56Context *s)
77 77
{
78 78
    VP56RangeCoder *c = &s->c;
79
    Vp56Model *model = s->modelp;
79
    VP56Model *model = s->modelp;
80 80
    int i, ctx, type;
81 81

  
82 82
    for (ctx=0; ctx<3; ctx++) {
libavcodec/vp56.h
84 84
    uint8_t coeff_runv[2][14];       /* run value (vp6 only) */
85 85
    uint8_t mb_type[3][10][10];      /* model for decoding MB type */
86 86
    uint8_t mb_types_stats[3][10][2];/* contextual, next MB type stats */
87
} Vp56Model;
87
} VP56Model;
88 88

  
89 89
struct vp56_context {
90 90
    AVCodecContext *avctx;
......
155 155
    VP56ParseCoeffModels parse_coeff_models;
156 156
    VP56ParseHeader parse_header;
157 157

  
158
    Vp56Model *modelp;
159
    Vp56Model models[2];
158
    VP56Model *modelp;
159
    VP56Model models[2];
160 160

  
161 161
    /* huffman decoding */
162 162
    int use_huffman;
libavcodec/vp6.c
164 164

  
165 165
static void vp6_default_models_init(VP56Context *s)
166 166
{
167
    Vp56Model *model = s->modelp;
167
    VP56Model *model = s->modelp;
168 168

  
169 169
    model->vector_dct[0] = 0xA2;
170 170
    model->vector_dct[1] = 0xA4;
......
183 183
static void vp6_parse_vector_models(VP56Context *s)
184 184
{
185 185
    VP56RangeCoder *c = &s->c;
186
    Vp56Model *model = s->modelp;
186
    VP56Model *model = s->modelp;
187 187
    int comp, node;
188 188

  
189 189
    for (comp=0; comp<2; comp++) {
......
234 234
static void vp6_parse_coeff_models(VP56Context *s)
235 235
{
236 236
    VP56RangeCoder *c = &s->c;
237
    Vp56Model *model = s->modelp;
237
    VP56Model *model = s->modelp;
238 238
    int def_prob[11];
239 239
    int node, cg, ctx, pos;
240 240
    int ct;    /* code type */
......
299 299
static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
300 300
{
301 301
    VP56RangeCoder *c = &s->c;
302
    Vp56Model *model = s->modelp;
302
    VP56Model *model = s->modelp;
303 303
    int comp;
304 304

  
305 305
    *vect = (VP56mv) {0,0};
......
352 352

  
353 353
static void vp6_parse_coeff_huffman(VP56Context *s)
354 354
{
355
    Vp56Model *model = s->modelp;
355
    VP56Model *model = s->modelp;
356 356
    uint8_t *permute = s->scantable.permutated;
357 357
    VLC *vlc_coeff;
358 358
    int coeff, sign, coeff_idx;
......
408 408
static void vp6_parse_coeff(VP56Context *s)
409 409
{
410 410
    VP56RangeCoder *c = s->ccp;
411
    Vp56Model *model = s->modelp;
411
    VP56Model *model = s->modelp;
412 412
    uint8_t *permute = s->scantable.permutated;
413 413
    uint8_t *model1, *model2, *model3;
414 414
    int coeff, sign, coeff_idx;

Also available in: Unified diff