diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/vp56.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/vp56.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/vp56.c b/chromium/third_party/ffmpeg/libavcodec/vp56.c index a0cb060d68a..ba39b56436a 100644 --- a/chromium/third_party/ffmpeg/libavcodec/vp56.c +++ b/chromium/third_party/ffmpeg/libavcodec/vp56.c @@ -83,16 +83,16 @@ static void vp56_parse_mb_type_models(VP56Context *s) int i, ctx, type; for (ctx=0; ctx<3; ctx++) { - if (vp56_rac_get_prob(c, 174)) { + if (vp56_rac_get_prob_branchy(c, 174)) { int idx = vp56_rac_gets(c, 4); memcpy(model->mb_types_stats[ctx], ff_vp56_pre_def_mb_type_stats[idx][ctx], sizeof(model->mb_types_stats[ctx])); } - if (vp56_rac_get_prob(c, 254)) { + if (vp56_rac_get_prob_branchy(c, 254)) { for (type=0; type<10; type++) { for(i=0; i<2; i++) { - if (vp56_rac_get_prob(c, 205)) { + if (vp56_rac_get_prob_branchy(c, 205)) { int delta, sign = vp56_rac_get(c); delta = vp56_rac_get_tree(c, ff_vp56_pmbtm_tree, @@ -153,7 +153,7 @@ static VP56mb vp56_parse_mb_type(VP56Context *s, uint8_t *mb_type_model = s->modelp->mb_type[ctx][prev_type]; VP56RangeCoder *c = &s->c; - if (vp56_rac_get_prob(c, mb_type_model[0])) + if (vp56_rac_get_prob_branchy(c, mb_type_model[0])) return prev_type; else return vp56_rac_get_tree(c, ff_vp56_pmbt_tree, mb_type_model); @@ -700,9 +700,9 @@ av_cold int ff_vp56_init_context(AVCodecContext *avctx, VP56Context *s, ff_vp3dsp_init(&s->vp3dsp, avctx->flags); ff_vp56dsp_init(&s->vp56dsp, avctx->codec->id); for (i = 0; i < 64; i++) { -#define T(x) (x >> 3) | ((x & 7) << 3) - s->idct_scantable[i] = T(ff_zigzag_direct[i]); -#undef T +#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3) + s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]); +#undef TRANSPOSE } for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) { |