[FFmpeg-cvslog] mathops: Drop disabled alternative mid_pred() implementation

Diego Biurrun git at videolan.org
Sun Mar 19 17:06:39 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon Aug  1 20:15:07 2016 +0200| [be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e] | committer: Diego Biurrun

mathops: Drop disabled alternative mid_pred() implementation

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e
---

 libavcodec/mathops.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index bd85dd7..0afc82a 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
 



More information about the ffmpeg-cvslog mailing list