[SCM] libav/experimental: Avoid cast of double nan to int. It may cause exceptions on some platform.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:16:50 UTC 2013


The following commit has been merged in the experimental branch:
commit 1405782cf4eaae7fd4bcb3d9da2c39f655314b41
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sat Oct 2 09:50:56 2010 +0000

    Avoid cast of double nan to int.
    It may cause exceptions on some platform.
    
    Originally committed as revision 25311 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/rational.c b/libavutil/rational.c
index 0e0571e..efed674 100644
--- a/libavutil/rational.c
+++ b/libavutil/rational.c
@@ -96,10 +96,12 @@ AVRational av_sub_q(AVRational b, AVRational c){
 AVRational av_d2q(double d, int max){
     AVRational a;
 #define LOG2  0.69314718055994530941723212145817656807550013436025
-    int exponent= FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
-    int64_t den= 1LL << (61 - exponent);
+    int exponent;
+    int64_t den;
     if (isnan(d))
         return (AVRational){0,0};
+    exponent = FFMAX( (int)(log(fabs(d) + 1e-20)/LOG2), 0);
+    den = 1LL << (61 - exponent);
     av_reduce(&a.num, &a.den, (int64_t)(d * den + 0.5), den, max);
 
     return a;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list