diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-22 23:40:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-22 23:42:17 +0200 |
| commit | ea5dab58e074a91330e1f076a4cbe8fece889afe (patch) | |
| tree | a94e47797fdd3adf9ac8b995cd562c2acf2fd2d3 /libavcodec/ra288.h | |
| parent | 841c1be57e59bc133cb615b48b0888ad9833156b (diff) | |
| parent | c89e428ed8c2c31396af2d18cab4342b7d82958f (diff) | |
| download | ffmpeg-ea5dab58e074a91330e1f076a4cbe8fece889afe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dwt: check malloc calls
ppc: Drop unused header regs.h
af_resample: remove an extra space in the log output
Convert vector_fmul range of functions to YASM and add AVX versions
lavfi: add an audio split filter
lavfi: rename vf_split.c to split.c
Conflicts:
doc/filters.texi
libavcodec/ppc/regs.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_split.c
libavfilter/split.c
libavfilter/version.h
libavfilter/vf_split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra288.h')
| -rw-r--r-- | libavcodec/ra288.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index 769e30ec17..15c9a7bc9a 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -97,7 +97,7 @@ static const int16_t codetable[128][5]={ { 3746, -606, 53, -269, -3301}, { 606, 2018, -1316, 4064, 398} }; -DECLARE_ALIGNED(16, static const float, syn_window)[FFALIGN(111, 8)]={ +DECLARE_ALIGNED(32, static const float, syn_window)[FFALIGN(111, 16)]={ 0.576690972, 0.580838025, 0.585013986, 0.589219987, 0.59345597, 0.597723007, 0.602020264, 0.606384277, 0.610748291, 0.615142822, 0.619598389, 0.624084473, 0.628570557, 0.633117676, 0.637695313, 0.642272949, 0.646911621, 0.651580811, @@ -119,7 +119,7 @@ DECLARE_ALIGNED(16, static const float, syn_window)[FFALIGN(111, 8)]={ 0.142852783, 0.0954284668,0.0477600098 }; -DECLARE_ALIGNED(16, static const float, gain_window)[FFALIGN(38, 8)]={ +DECLARE_ALIGNED(32, static const float, gain_window)[FFALIGN(38, 16)]={ 0.505699992, 0.524200022, 0.54339999, 0.563300014, 0.583953857, 0.60534668, 0.627502441, 0.650482178, 0.674316406, 0.699005127, 0.724578857, 0.75112915, 0.778625488, 0.807128906, 0.836669922, 0.86730957, 0.899078369, 0.932006836, @@ -130,7 +130,7 @@ DECLARE_ALIGNED(16, static const float, gain_window)[FFALIGN(38, 8)]={ }; /** synthesis bandwidth broadening table */ -DECLARE_ALIGNED(16, static const float, syn_bw_tab)[FFALIGN(36, 8)] = { +DECLARE_ALIGNED(32, static const float, syn_bw_tab)[FFALIGN(36, 16)] = { 0.98828125, 0.976699829, 0.965254128, 0.953942537, 0.942763507, 0.931715488, 0.920796931, 0.910006344, 0.899342179, 0.888803005, 0.878387332, 0.868093729, 0.857920766, 0.847867012, 0.837931097, 0.828111589, 0.818407178, 0.808816493, @@ -140,7 +140,7 @@ DECLARE_ALIGNED(16, static const float, syn_bw_tab)[FFALIGN(36, 8)] = { }; /** gain bandwidth broadening table */ -DECLARE_ALIGNED(16, static const float, gain_bw_tab)[FFALIGN(10, 8)] = { +DECLARE_ALIGNED(32, static const float, gain_bw_tab)[FFALIGN(10, 16)] = { 0.90625, 0.821289063, 0.74432373, 0.674499512, 0.61126709, 0.553955078, 0.50201416, 0.454956055, 0.41229248, 0.373657227 }; |