[FFmpeg-cvslog] avutil/rational: avoid llrint() and rint()

Michael Niedermayer git at videolan.org
Thu Jul 4 23:57:56 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  4 23:50:58 2013 +0200| [46ad287a2a87554bb10dff437dfad7edcd38bb69] | committer: Michael Niedermayer

avutil/rational: avoid llrint() and rint()

This should workaround issues with these functions on ia64 and sparc64

Fixes Ticket2713

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/rational.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavutil/rational.c b/libavutil/rational.c
index aabe58f..ec2f2e5 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -114,9 +114,10 @@ AVRational av_d2q(double d, int max)
         return (AVRational) { d < 0 ? -1 : 1, 0 };
     exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
     den = 1LL << (61 - exponent);
-    av_reduce(&a.num, &a.den, rint(d * den), den, max);
+    // (int64_t)rint() and llrint() do not work with gcc on ia64 and sparc64
+    av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, max);
     if ((!a.num || !a.den) && d && max>0 && max<INT_MAX)
-        av_reduce(&a.num, &a.den, llrint(d * den), den, INT_MAX);
+        av_reduce(&a.num, &a.den, floor(d * den + 0.5), den, INT_MAX);
 
     return a;
 }



More information about the ffmpeg-cvslog mailing list