diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/vp5.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/vp5.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ffmpeg/libavcodec/vp5.c b/contrib/ffmpeg/libavcodec/vp5.c index ac953c7aa..8a8c217c0 100644 --- a/contrib/ffmpeg/libavcodec/vp5.c +++ b/contrib/ffmpeg/libavcodec/vp5.c @@ -41,10 +41,10 @@ static int vp5_parse_header(vp56_context_t *s, uint8_t *buf, int buf_size, int rows, cols; vp56_init_range_decoder(&s->c, buf, buf_size); - s->frames[VP56_FRAME_CURRENT].key_frame = !vp56_rac_get(c); + s->framep[VP56_FRAME_CURRENT]->key_frame = !vp56_rac_get(c); vp56_rac_get(c); vp56_init_dequant(s, vp56_rac_gets(c, 6)); - if (s->frames[VP56_FRAME_CURRENT].key_frame) + if (s->framep[VP56_FRAME_CURRENT]->key_frame) { vp56_rac_gets(c, 8); if(vp56_rac_gets(c, 5) > 5) @@ -145,7 +145,7 @@ static void vp5_parse_coeff_models(vp56_context_t *s) if (vp56_rac_get_prob(c, vp5_dccv_pct[pt][node])) { def_prob[node] = vp56_rac_gets_nn(c, 7); s->coeff_model_dccv[pt][node] = def_prob[node]; - } else if (s->frames[VP56_FRAME_CURRENT].key_frame) { + } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) { s->coeff_model_dccv[pt][node] = def_prob[node]; } @@ -156,7 +156,7 @@ static void vp5_parse_coeff_models(vp56_context_t *s) if (vp56_rac_get_prob(c, vp5_ract_pct[ct][pt][cg][node])) { def_prob[node] = vp56_rac_gets_nn(c, 7); s->coeff_model_ract[pt][ct][cg][node] = def_prob[node]; - } else if (s->frames[VP56_FRAME_CURRENT].key_frame) { + } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) { s->coeff_model_ract[pt][ct][cg][node] = def_prob[node]; } @@ -164,7 +164,7 @@ static void vp5_parse_coeff_models(vp56_context_t *s) for (pt=0; pt<2; pt++) for (ctx=0; ctx<36; ctx++) for (node=0; node<5; node++) - s->coeff_model_dcct[pt][ctx][node] = clip(((s->coeff_model_dccv[pt][node] * vp5_dccv_lc[node][ctx][0] + 128) >> 8) + vp5_dccv_lc[node][ctx][1], 1, 254); + s->coeff_model_dcct[pt][ctx][node] = av_clip(((s->coeff_model_dccv[pt][node] * vp5_dccv_lc[node][ctx][0] + 128) >> 8) + vp5_dccv_lc[node][ctx][1], 1, 254); /* coeff_model_acct is a linear combination of coeff_model_ract */ for (ct=0; ct<3; ct++) @@ -172,7 +172,7 @@ static void vp5_parse_coeff_models(vp56_context_t *s) for (cg=0; cg<3; cg++) for (ctx=0; ctx<6; ctx++) for (node=0; node<5; node++) - s->coeff_model_acct[pt][ct][cg][ctx][node] = clip(((s->coeff_model_ract[pt][ct][cg][node] * vp5_ract_lc[ct][cg][node][ctx][0] + 128) >> 8) + vp5_ract_lc[ct][cg][node][ctx][1], 1, 254); + s->coeff_model_acct[pt][ct][cg][ctx][node] = av_clip(((s->coeff_model_ract[pt][ct][cg][node] * vp5_ract_lc[ct][cg][node][ctx][0] + 128) >> 8) + vp5_ract_lc[ct][cg][node][ctx][1], 1, 254); } static void vp5_parse_coeff(vp56_context_t *s) |