Merge commit 'd5a55981986ac5d1a31aef3a8d16eaff8534a412'

[ffmpeg] / libavcodec / dcadec.c

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index c072044453ad308d2ceac28268fb97d0bfe8daa9..e23155ca4fc1868dff8eabfe3df0717e441e6cd6 100644 (file)
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -2107,7 +2107,8 @@ static float dca_dmix_code(unsigned code)
 {
     int sign = (code >> 8) - 1;
     code &= 0xff;
-    return ((dca_dmixtable[code] ^ sign) - sign) * 0x1p-15;
+#define POW2_MINUS15 .000030517578125
+    return ((dca_dmixtable[code] ^ sign) - sign) * POW2_MINUS15;
 }
 
 /**
@@ -2422,7 +2423,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
             }
         }
 
-        /* make sure that we have managed to get equivelant dts/avcodec channel
+        /* make sure that we have managed to get equivalent dts/avcodec channel
          * masks in some sense -- unfortunately some channels could overlap */
         if (av_popcount(channel_mask) != av_popcount(channel_layout)) {
             av_log(avctx, AV_LOG_DEBUG,