[FFmpeg-soc] [soc]: r3293 - in aac: aac.c aactab.c aactab.h

[superdump]

Author: superdump
Date: Fri Aug 15 00:16:58 2008
New Revision: 3293

Log:
Properly share ff_aac_pow2sf_tab[] regardless of whether it is hardcoded. It
will be used by the encoder.


Modified:
   aac/aac.c
   aac/aactab.c
   aac/aactab.h

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Fri Aug 15 00:16:58 2008
@@ -90,10 +90,6 @@
 #include <math.h>
 #include <string.h>
 
-#ifndef CONFIG_HARDCODED_TABLES
-    static float ff_aac_pow2sf_tab[316];
-#endif /* CONFIG_HARDCODED_TABLES */
-
 static VLC vlc_scalefactors;
 static VLC vlc_spectral[11];
 

Modified: aac/aactab.c
==============================================================================
--- aac/aactab.c	(original)
+++ aac/aactab.c	Fri Aug 15 00:16:58 2008
@@ -988,4 +988,8 @@ const float ff_aac_pow2sf_tab[316] = {
     2.68435456e+08, 3.19225354e+08, 3.79625062e+08, 4.51452825e+08,
 };
 
+#else
+
+float ff_aac_pow2sf_tab[316];
+
 #endif /* CONFIG_HARDCODED_TABLES */

Modified: aac/aactab.h
==============================================================================
--- aac/aactab.h	(original)
+++ aac/aactab.h	Fri Aug 15 00:16:58 2008
@@ -67,6 +67,8 @@ extern const float *ff_aac_codebook_vect
 
 #ifdef CONFIG_HARDCODED_TABLES
 extern const float ff_aac_pow2sf_tab[316];
+#else
+extern       float ff_aac_pow2sf_tab[316];
 #endif /* CONFIG_HARDCODED_TABLES */
 
 #endif /* FFMPEG_AACTAB_H */