diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:52:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 13:01:11 +0100 |
| commit | 9e22b8aca0fdecee332191fabded428e6a183d25 (patch) | |
| tree | be8d6f2874d2045e449796d046642d9a1d00c730 /libavcodec/aacps_tablegen.h | |
| parent | 8617be28d074c4708d2c948cbc311737cf2fbf39 (diff) | |
| parent | 0ba8ba165b84a971dbe9356b57f272dc81410eaf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacps: Adjust some const qualifiers to suppress warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacps_tablegen.h')
| -rw-r--r-- | libavcodec/aacps_tablegen.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h index 05a2af6524..9df38ffd84 100644 --- a/libavcodec/aacps_tablegen.h +++ b/libavcodec/aacps_tablegen.h @@ -28,6 +28,7 @@ #if CONFIG_HARDCODED_TABLES #define ps_tableinit() +#define TABLE_CONST const #include "libavcodec/aacps_tables.h" #else #include "libavutil/common.h" @@ -37,6 +38,7 @@ #define NR_ALLPASS_BANDS20 30 #define NR_ALLPASS_BANDS34 50 #define PS_AP_LINKS 3 +#define TABLE_CONST static float pd_re_smooth[8*8*8]; static float pd_im_smooth[8*8*8]; static float HA[46][8][4]; @@ -45,7 +47,7 @@ static DECLARE_ALIGNED(16, float, f20_0_8) [ 8][8][2]; static DECLARE_ALIGNED(16, float, f34_0_12)[12][8][2]; static DECLARE_ALIGNED(16, float, f34_1_8) [ 8][8][2]; static DECLARE_ALIGNED(16, float, f34_2_4) [ 4][8][2]; -static DECLARE_ALIGNED(16, float, Q_fract_allpass)[2][50][3][2]; +static TABLE_CONST DECLARE_ALIGNED(16, float, Q_fract_allpass)[2][50][3][2]; static DECLARE_ALIGNED(16, float, phi_fract)[2][50][2]; static const float g0_Q8[] = { |