aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mathops.h
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-19 16:05:13 +0100
committerClément Bœsch <u@pkh.me>2017-03-19 16:05:13 +0100
commit87cd8dc0b0b2293fddeb94c6c5c12a27ec3874cf (patch)
tree12692820c092d7e4b3c19ff4c33dc2f73bc9980d /libavcodec/mathops.h
parent56d63208d8249be3d2a54b8a25c27fc178d84df0 (diff)
parentbe1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e (diff)
downloadffmpeg-87cd8dc0b0b2293fddeb94c6c5c12a27ec3874cf.tar.gz
Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'
* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e': mathops: Drop disabled alternative mid_pred() implementation Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/mathops.h')
-rw-r--r--libavcodec/mathops.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 2cc8963a98..1c35664318 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -97,15 +97,6 @@ static av_always_inline unsigned UMULH(unsigned a, unsigned b){
#define mid_pred mid_pred
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(c>b){
if(c>a) b=a;
@@ -118,7 +109,6 @@ static inline av_const int mid_pred(int a, int b, int c)
}
}
return b;
-#endif
}
#endif