Give more meaningful message on BMP header parsing error

[ffmpeg] / libavcodec / aactab.h

diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index e7f14e6ed60e2f60099a59569f819f0f6d8b8e11..07574d8da782d32cd62029dd6f49ce3495f51bf8 100644 (file)
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -27,26 +27,48 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef FFMPEG_AACTAB_H
-#define FFMPEG_AACTAB_H
+#ifndef AVCODEC_AACTAB_H
+#define AVCODEC_AACTAB_H
 
 #include "libavutil/mem.h"
 #include "aac.h"
 
 #include <stdint.h>
 
+/* NOTE:
+ * Tables in this file are used by the AAC decoder and will be used by the AAC
+ * encoder.
+ */
+
+/* @name window coefficients
+ * @{
+ */
+DECLARE_ALIGNED(16, extern float,  ff_aac_kbd_long_1024[1024]);
+DECLARE_ALIGNED(16, extern float,  ff_aac_kbd_short_128[128]);
+// @}
+
+/* @name number of scalefactor window bands for long and short transform windows respectively
+ * @{
+ */
+extern const uint8_t ff_aac_num_swb_1024[];
+extern const uint8_t ff_aac_num_swb_128 [];
+// @}
+
+extern const uint8_t ff_aac_pred_sfb_max [];
+
 extern const uint32_t ff_aac_scalefactor_code[121];
 extern const uint8_t  ff_aac_scalefactor_bits[121];
 
-extern const uint16_t *ff_aac_spectral_codes[11];
-extern const uint8_t  *ff_aac_spectral_bits [11];
+extern const uint16_t * const ff_aac_spectral_codes[11];
+extern const uint8_t  * const ff_aac_spectral_bits [11];
 extern const uint16_t  ff_aac_spectral_sizes[11];
 
-extern const int8_t *ff_aac_codebook_vectors[];
+extern const float *ff_aac_codebook_vectors[];
 
 #ifdef CONFIG_HARDCODED_TABLES
-extern const float ff_aac_ivquant_tab[IVQUANT_SIZE];
 extern const float ff_aac_pow2sf_tab[316];
+#else
+extern       float ff_aac_pow2sf_tab[316];
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* FFMPEG_AACTAB_H */
+#endif /* AVCODEC_AACTAB_H */