[FFmpeg-cvslog] mathematics: Kill non-compiling disabled cruft

Diego Biurrun git at videolan.org
Sun Mar 19 00:52:46 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Jul 29 23:24:27 2016 +0200| [00a0419c7f7ebce9010cba93b7ff67c9f1165815] | committer: Diego Biurrun

mathematics: Kill non-compiling disabled cruft

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

 libavutil/mathematics.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index c9b24af..617726d 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -58,7 +58,6 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd)
         else
             return a / c * b + (a % c * b + r) / c;
     } else {
-#if 1
         uint64_t a0  = a & 0xFFFFFFFF;
         uint64_t a1  = a >> 32;
         uint64_t b0  = b & 0xFFFFFFFF;
@@ -82,14 +81,6 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd)
         }
         return t1;
     }
-#else
-        AVInteger ai;
-        ai = av_mul_i(av_int2i(a), av_int2i(b));
-        ai = av_add_i(ai, av_int2i(r));
-
-        return av_i2int(av_div_i(ai, av_int2i(c)));
-    }
-#endif
 }
 
 int64_t av_rescale(int64_t a, int64_t b, int64_t c)



More information about the ffmpeg-cvslog mailing list