avfilter: Remove deprecated avfilter_link_get_channels

[ffmpeg] / libavutil / avsscanf.c

diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c
index 360170c9a938d1acaa4a01c8e43ef3e378e2db90..b7f0f71c2d5e1837acb4d60a6d0135d8ce412eb4 100644 (file)
--- a/libavutil/avsscanf.c
+++ b/libavutil/avsscanf.c
@@ -113,7 +113,7 @@ static int ffshgetc(FFFILE *f)
 }
 
 #define shlim(f, lim) ffshlim((f), (lim))
-#define shgetc(f) (((f)->rpos != (f)->shend) ? *(f)->rpos++ : ffshgetc(f))
+#define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : ffshgetc(f))
 #define shunget(f) ((f)->shend ? (void)(f)->rpos-- : (void)0)
 
 static const unsigned char table[] = { -1,
@@ -229,9 +229,9 @@ static long long scanexp(FFFILE *f, int pok)
         return LLONG_MIN;
     }
     for (x=0; c-'0'<10U && x<INT_MAX/10; c = shgetc(f))
-        x = 10*x + c-'0';
+        x = 10*x + (c-'0');
     for (y=x; c-'0'<10U && y<LLONG_MAX/100; c = shgetc(f))
-        y = 10*y + c-'0';
+        y = 10*y + (c-'0');
     for (; c-'0'<10U; c = shgetc(f));
     shunget(f);
     return neg ? -y : y;
@@ -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)