[FFmpeg-cvslog] avutil/avsscanf: do not use long double functions

Paul B Mahol git at videolan.org
Sat Dec 15 11:00:42 EET 2018


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Dec 15 09:58:28 2018 +0100| [be60dc2145ba2c4e2c66213688b377367bdb9665] | committer: Paul B Mahol

avutil/avsscanf: do not use long double functions

Not needed when only double is used.

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

 libavutil/avsscanf.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c
index 360170c9a9..1c85412fd4 100644
--- a/libavutil/avsscanf.c
+++ b/libavutil/avsscanf.c
@@ -454,8 +454,8 @@ static double decfloat(FFFILE *f, int c, int bits, int emin, int sign, int pok)
 
     /* Calculate bias term to force rounding, move out lower bits */
     if (bits < DBL_MANT_DIG) {
-        bias = copysignl(scalbn(1, 2*DBL_MANT_DIG-bits-1), y);
-        frac = fmodl(y, scalbn(1, DBL_MANT_DIG-bits));
+        bias = copysign(scalbn(1, 2*DBL_MANT_DIG-bits-1), y);
+        frac = fmod(y, scalbn(1, DBL_MANT_DIG-bits));
         y -= frac;
         y += bias;
     }
@@ -473,7 +473,7 @@ static double decfloat(FFFILE *f, int c, int bits, int emin, int sign, int pok)
             else
                 frac += 0.75*sign;
         }
-        if (DBL_MANT_DIG-bits >= 2 && !fmodl(frac, 1))
+        if (DBL_MANT_DIG-bits >= 2 && !fmod(frac, 1))
             frac++;
     }
 
@@ -491,7 +491,7 @@ static double decfloat(FFFILE *f, int c, int bits, int emin, int sign, int pok)
             errno = ERANGE;
     }
 
-    return scalbnl(y, e2);
+    return scalbn(y, e2);
 }
 
 static double hexfloat(FFFILE *f, int bits, int emin, int sign, int pok)
@@ -595,7 +595,7 @@ static double hexfloat(FFFILE *f, int bits, int emin, int sign, int pok)
     }
 
     if (bits < DBL_MANT_DIG)
-        bias = copysignl(scalbn(1, 32+DBL_MANT_DIG-bits-1), sign);
+        bias = copysign(scalbn(1, 32+DBL_MANT_DIG-bits-1), sign);
 
     if (bits<32 && y && !(x&1)) x++, y=0;
 
@@ -604,7 +604,7 @@ static double hexfloat(FFFILE *f, int bits, int emin, int sign, int pok)
 
     if (!y) errno = ERANGE;
 
-    return scalbnl(y, e2);
+    return scalbn(y, e2);
 }
 
 static double fffloatscan(FFFILE *f, int prec, int pok)



More information about the ffmpeg-cvslog mailing list