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.h | 1 - 1 file changed, 1 deletion(-) (limited to 'libavcodec/aac.h') diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 32baf9d0c5..9c6ac277d5 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -141,7 +141,6 @@ typedef struct PredictorState { #define SCALE_MAX_POS 255 ///< scalefactor index maximum value #define SCALE_MAX_DIFF 60 ///< maximum scalefactor difference allowed by standard #define SCALE_DIFF_ZERO 60 ///< codebook index corresponding to zero scalefactor indices difference -#define POW_SF2_ZERO 200 ///< ff_aac_pow2sf_tab index corresponding to pow(2, 0); /** * Long Term Prediction -- cgit v1.2.3