ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Sun Mar 19 16:05:13 2017 +0100| [87cd8dc0b0b2293fddeb94c6c5c12a27ec3874cf] | committer: Clément Bœsch
Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e' * commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e': mathops: Drop disabled alternative mid_pred() implementation Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87cd8dc0b0b2293fddeb94c6c5c12a27ec3874cf --- libavcodec/mathops.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 2cc8963..1c35664 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 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
