From 7a12d97eb1aac6621f20cb7bffd0f74f8e46ae2c Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 18 Oct 2012 15:32:11 +0100 Subject: aac: fix build with hardcoded tables aac_tablegen.h includes aac.h for the POW_SF2_ZERO definition, but this also pulls in a raft of other headers, some of which are not safe to use in code built with the host compiler. Moving POW_SF2_ZERO to aac_tablegen_decl.h, where the declaration of the array it relates to already resides, fixes the problems. Signed-off-by: Mans Rullgard --- libavcodec/aac_tablegen_decl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec/aac_tablegen_decl.h') diff --git a/libavcodec/aac_tablegen_decl.h b/libavcodec/aac_tablegen_decl.h index 496ca0c677..a5fd1cf345 100644 --- a/libavcodec/aac_tablegen_decl.h +++ b/libavcodec/aac_tablegen_decl.h @@ -23,6 +23,8 @@ #ifndef AVCODEC_AAC_TABLEGEN_DECL_H #define AVCODEC_AAC_TABLEGEN_DECL_H +#define POW_SF2_ZERO 200 ///< ff_aac_pow2sf_tab index corresponding to pow(2, 0); + #if CONFIG_HARDCODED_TABLES #define ff_aac_tableinit() extern const float ff_aac_pow2sf_tab[428]; -- cgit v1.2.3