eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '213e606752'

Browse source 
* commit '213e606752':
  Replace av_unused attributes by block structures

Conflicts:
	libavcodec/h264_loopfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-05 19:24:49 +02:00
commit 1e4e760f76
4 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libavcodec/rangecoder.h
View file

@ -115,7 +115,6 @@ static inline void refill(RangeCoder *c)
static inline int get_rac(RangeCoder *c, uint8_t *const state)
{
int range1 = (c->range * (*state)) >> 8;
int av_unused one_mask;
c->range -= range1;
#if 1
@ -131,13 +130,14 @@ static inline int get_rac(RangeCoder *c, uint8_t *const state)
return 1;
}
#else
one_mask = (c->range - c->low - 1) >> 31;
{
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)];
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;