diff options
| author | Matt Oliver <protogonoi@gmail.com> | 2014-04-07 16:57:08 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 16:04:08 +0200 |
| commit | cef99e12bc49b252473ca70ca5aa6ad7ef3be39b (patch) | |
| tree | ca3d09a3ad5defb20a0684da3fd1ce7304df26d1 /libavcodec/vp56.c | |
| parent | f1c167496e41cabc2bd1b890b149e4b34648cad6 (diff) | |
| download | ffmpeg-cef99e12bc49b252473ca70ca5aa6ad7ef3be39b.tar.gz | |
Use rac_get_prob branchy version when used within a conditional branch.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 7c91c5433b..ba39b56436 100644 --- a/libavcodec/vp56.c +++ b/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); |