mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'
* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e': mathops: Drop disabled alternative mid_pred() implementation Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
87cd8dc0b0
|
@ -97,15 +97,6 @@ static av_always_inline unsigned UMULH(unsigned a, unsigned b){
|
||||||
#define mid_pred mid_pred
|
#define mid_pred mid_pred
|
||||||
static inline av_const int mid_pred(int a, int b, int c)
|
static inline av_const int mid_pred(int a, int b, int c)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
int t= (a-b)&((a-b)>>31);
|
|
||||||
a-=t;
|
|
||||||
b+=t;
|
|
||||||
b-= (b-c)&((b-c)>>31);
|
|
||||||
b+= (a-b)&((a-b)>>31);
|
|
||||||
|
|
||||||
return b;
|
|
||||||
#else
|
|
||||||
if(a>b){
|
if(a>b){
|
||||||
if(c>b){
|
if(c>b){
|
||||||
if(c>a) b=a;
|
if(c>a) b=a;
|
||||||
|
@ -118,7 +109,6 @@ static inline av_const int mid_pred(int a, int b, int c)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return b;
|
return b;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue