Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

[ffmpeg] / libavcodec / sinewin_tablegen_template.c

diff --git a/libavcodec/sinewin_tablegen_template.c b/libavcodec/sinewin_tablegen_template.c
index 45547c43c4cd35a9fbde49a194343073da5a55d0..43ce1ba82e8384f15a9c53d7403c0dc1c2486de5 100644 (file)
--- a/libavcodec/sinewin_tablegen_template.c
+++ b/libavcodec/sinewin_tablegen_template.c
@@ -21,24 +21,18 @@
  */
 
 #include <stdlib.h>
+#include "libavcodec/aac_defines.h"
 #define CONFIG_HARDCODED_TABLES 0
 
 #if USE_FIXED
-#define ADD_SUFFIX(a) a ## _fixed
-#define INTFLOAT int
 #define WRITE_FUNC write_int32_t_array
-
 #else
-
-#define ADD_SUFFIX(a) a
-#define INTFLOAT float
 #define WRITE_FUNC write_float_array
-
 #endif
 
 #define SINETABLE_CONST
 #define SINETABLE(size) \
-    INTFLOAT ADD_SUFFIX(ff_sine_##size)[size]
+    INTFLOAT AAC_RENAME(ff_sine_##size)[size]
 #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
 #include "sinewin_tablegen.h"
 #include "tableprint.h"
@@ -50,9 +44,9 @@ int main(void)
     write_fileheader();
 
     for (i = 5; i <= 13; i++) {
-        ADD_SUFFIX(ff_init_ff_sine_windows)(i);
+        AAC_RENAME(ff_init_ff_sine_windows)(i);
         printf("SINETABLE(%4i) = {\n", 1 << i);
-        WRITE_FUNC(ADD_SUFFIX(ff_sine_windows)[i], 1 << i);
+        WRITE_FUNC(AAC_RENAME(ff_sine_windows)[i], 1 << i);
         printf("};\n");
     }