Commit 3f049646 authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'e4d5b551'

* commit 'e4d5b551':
  rangecoder: Kill non-compiling disabled cruft
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents de130842 e4d5b551
...@@ -117,7 +117,6 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state) ...@@ -117,7 +117,6 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state)
int range1 = (c->range * (*state)) >> 8; int range1 = (c->range * (*state)) >> 8;
c->range -= range1; c->range -= range1;
#if 1
if (c->low < c->range) { if (c->low < c->range) {
*state = c->zero_state[*state]; *state = c->zero_state[*state];
refill(c); refill(c);
...@@ -129,19 +128,6 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state) ...@@ -129,19 +128,6 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state)
refill(c); refill(c);
return 1; return 1;
} }
#else
{
int one_mask one_mask = (c->range - c->low - 1) >> 31;
c->low -= c->range & one_mask;
c->range += (range1 - c->range) & one_mask;
*state = c->zero_state[(*state) + (256 & one_mask)];
}
refill(c);
return one_mask & 1;
#endif
} }
#endif /* AVCODEC_RANGECODER_H */ #endif /* AVCODEC_RANGECODER_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment