Change/simplify the tableprint/tablegen API.

Originally committed as revision 22761 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 21 insertions, 30 deletions

diff --git a/libavcodec/mpegaudio_tablegen.c b/libavcodec/mpegaudio_tablegen.c
index 9f832a3b0e..70d145b205 100644
--- a/libavcodec/mpegaudio_tablegen.c
+++ b/libavcodec/mpegaudio_tablegen.c
@@ -25,36 +25,27 @@
 #include "mpegaudio_tablegen.h"
 #include "tableprint.h"
 
-void tableinit(void)
+int main(void)
 {
     mpegaudio_tableinit();
-}
 
-const struct tabledef tables[] = {
-    {
-        "static const int8_t table_4_3_exp[TABLE_4_3_SIZE]",
-        write_int8_array,
-        table_4_3_exp,
-        TABLE_4_3_SIZE
-    },
-    {
-        "static const uint32_t table_4_3_value[TABLE_4_3_SIZE]",
-        write_uint32_array,
-        table_4_3_value,
-        TABLE_4_3_SIZE
-    },
-    {
-        "static const uint32_t exp_table[512]",
-        write_uint32_array,
-        exp_table,
-        512
-    },
-    {
-        "static const uint32_t expval_table[512][16]",
-        write_uint32_2d_array,
-        expval_table,
-        512,
-        16
-    },
-    { NULL }
-};
+    write_fileheader();
+
+    printf("static const int8_t table_4_3_exp[TABLE_4_3_SIZE] = {\n");
+    write_int8_array(table_4_3_exp, TABLE_4_3_SIZE);
+    printf("};\n");
+
+    printf("static const uint32_t table_4_3_value[TABLE_4_3_SIZE] = {\n");
+    write_uint32_array(table_4_3_value, TABLE_4_3_SIZE);
+    printf("};\n");
+
+    printf("static const uint32_t exp_table[512] = {\n");
+    write_uint32_array(exp_table, 512);
+    printf("};\n");
+
+    printf("static const uint32_t expval_table[512][16] = {\n");
+    write_uint32_2d_array(expval_table, 512, 16);
+    printf("};\n");
+
+    return 0;
+}