mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'e4d5b55193109d08be47c42d320334546c006b51'
* commit 'e4d5b55193109d08be47c42d320334546c006b51': rangecoder: Kill non-compiling disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
3f04964671
@ -117,7 +117,6 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state)
|
||||
int range1 = (c->range * (*state)) >> 8;
|
||||
|
||||
c->range -= range1;
|
||||
#if 1
|
||||
if (c->low < c->range) {
|
||||
*state = c->zero_state[*state];
|
||||
refill(c);
|
||||
@ -129,19 +128,6 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state)
|
||||
refill(c);
|
||||
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 */
|
||||
|
Loading…
Reference in New Issue
Block a user