X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fac3.h;h=747f2f561dc73a11ad5413f42d9c63dc0b2a805b;hb=5adb5d9d894aa495e7bf9557b4c78350cbfc9d32;hp=3f67e09aea0e9c7ca38b19e4bcfbfe0810daabd4;hpb=518742bc21f7baa4c9059e9705fca131d4e3a87a;p=ffmpeg

diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 3f67e09aea0..747f2f561dc 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -73,8 +73,8 @@
 #define AC3_SPX_BLEND(x)        (x)
 #define AC3_DYNAMIC_RANGE1      0
 
-#define INTFLOAT                int
-#define SHORTFLOAT              int16_t
+typedef int                     INTFLOAT;
+typedef int16_t                 SHORTFLOAT;
 
 #else /* USE_FIXED */
 
@@ -92,18 +92,18 @@
 #define AC3_SPX_BLEND(x)        (x)* (1.0f/32)
 #define AC3_DYNAMIC_RANGE1      1.0f
 
-#define INTFLOAT                float
-#define SHORTFLOAT              float
+typedef float                   INTFLOAT;
+typedef float                   SHORTFLOAT;
 
 #endif /* USE_FIXED */
 
-#define AC3_LEVEL(x)            ROUND15((x) * FIXR15(0.7071067811865476))
+#define AC3_LEVEL(x)            ROUND15((x) * FIXR15(M_SQRT1_2))
 
 /* pre-defined gain values */
-#define LEVEL_PLUS_3DB          1.4142135623730950
+#define LEVEL_PLUS_3DB          M_SQRT2
 #define LEVEL_PLUS_1POINT5DB    1.1892071150027209
 #define LEVEL_MINUS_1POINT5DB   0.8408964152537145
-#define LEVEL_MINUS_3DB         0.7071067811865476
+#define LEVEL_MINUS_3DB         M_SQRT1_2
 #define LEVEL_MINUS_4POINT5DB   0.5946035575013605
 #define LEVEL_MINUS_6DB         0.5000000000000000
 #define LEVEL_MINUS_9DB         0.3535533905932738