Module: libav
Branch: master
Commit: c0085f94fea89b180e5727b193484a83586d3490

Author:    Derek Buitenhuis <[email protected]>
Committer: Derek Buitenhuis <[email protected]>
Date:      Tue Jan 15 16:09:01 2013 -0500

mpegaudio_tablegen: Don't use llrint

You cannot count on it being present on all systems, and you
cannot include libm.h in a host tool, so just hard code a baseline
implementation.

Signed-off-by: Derek Buitenhuis <[email protected]>

---

 libavcodec/mpegaudio_tablegen.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mpegaudio_tablegen.h b/libavcodec/mpegaudio_tablegen.h
index a6c203f..8a3e51a 100644
--- a/libavcodec/mpegaudio_tablegen.h
+++ b/libavcodec/mpegaudio_tablegen.h
@@ -61,7 +61,8 @@ static void mpegaudio_tableinit(void)
         for (value = 0; value < 16; value++) {
             /* cbrtf() isn't available on all systems, so we use powf(). */
             double f = (double)value * powf(value, 1.0 / 3.0) * pow(2, 
(exponent - 400) * 0.25 + FRAC_BITS + 5);
-            expval_table_fixed[exponent][value] = llrint(f);
+            /* llrint() isn't always available, so round and cast manually. */
+            expval_table_fixed[exponent][value] = (long long int) (f >= 0 ? 
floor(f + 0.5) : ceil(f - 0.5));
             expval_table_float[exponent][value] = f;
         }
         exp_table_fixed[exponent] = expval_table_fixed[exponent][1];

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to