aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-08-01 20:15:07 +0200
committerDiego Biurrun <diego@biurrun.de>2016-08-17 12:16:42 +0200
commitbe1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e (patch)
treee1e0834bad34c1dbc827de38d5195b90e0d5065e
parentbe3363f664d7314d55b42860bd4077154752d769 (diff)
downloadffmpeg-be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e.tar.gz
mathops: Drop disabled alternative mid_pred() implementation
-rw-r--r--libavcodec/mathops.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index bd85dd79be..0afc82a0f5 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -99,15 +99,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;
@@ -120,7 +111,6 @@ static inline av_const int mid_pred(int a, int b, int c)
}
}
return b;
-#endif
}
#endif