basic type mechanism working

1 files changed, 6 insertions, 3 deletions

diff --git a/ffmpeg/libavcodec/mpegaudio_tablegen.h b/ffmpeg/libavcodec/mpegaudio_tablegen.h
index 6c15d3c..f9557c9 100644
--- a/ffmpeg/libavcodec/mpegaudio_tablegen.h
+++ b/ffmpeg/libavcodec/mpegaudio_tablegen.h
@@ -48,7 +48,8 @@ static void mpegaudio_tableinit(void)
         double value = i / 4;
         double f, fm;
         int e, m;
-        f  = value / IMDCT_SCALAR * cbrtf(value) * pow(2, (i & 3) * 0.25);
+        /* cbrtf() isn't available on all systems, so we use powf(). */
+        f  = value / IMDCT_SCALAR * pow(value, 1.0 / 3.0) * pow(2, (i & 3) * 0.25);
         fm = frexp(f, &e);
         m  = (uint32_t)(fm * (1LL << 31) + 0.5);
         e += FRAC_BITS - 31 + 5 - 100;
@@ -59,8 +60,10 @@ static void mpegaudio_tableinit(void)
     }
     for (exponent = 0; exponent < 512; exponent++) {
         for (value = 0; value < 16; value++) {
-            double f = (double)value * cbrtf(value) * pow(2, (exponent - 400) * 0.25 + FRAC_BITS + 5) / IMDCT_SCALAR;
-            expval_table_fixed[exponent][value] = llrint(f);
+            /* cbrtf() isn't available on all systems, so we use powf(). */
+            double f = (double)value * pow(value, 1.0 / 3.0) * pow(2, (exponent - 400) * 0.25 + FRAC_BITS + 5) / IMDCT_SCALAR;
+            /* llrint() isn't always available, so round and cast manually. */
+            expval_table_fixed[exponent][value] = (long long int) (f < 0xFFFFFFFF ? floor(f + 0.5) : 0xFFFFFFFF);
             expval_table_float[exponent][value] = f;
         }
         exp_table_fixed[exponent] = expval_table_fixed[exponent][1];