summaryrefslogtreecommitdiff
path: root/libavcodec/aac.h
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-18 15:32:11 +0100
committerMans Rullgard <mans@mansr.com>2012-10-18 19:59:43 +0100
commit7a12d97eb1aac6621f20cb7bffd0f74f8e46ae2c (patch)
tree41252a33d2c16e26622d5327f2953d5e9e8087ee /libavcodec/aac.h
parente8fe208be8107a55621733b2d0deb2feb762f3d4 (diff)
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 <mans@mansr.com>
Diffstat (limited to 'libavcodec/aac.h')
-rw-r--r--libavcodec/aac.h1
1 files changed, 0 insertions, 1 deletions
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