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/aactab.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/aactab.h')
| -rw-r--r-- | libavcodec/aactab.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index c6213999b5..6ed3b4a6be 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -44,8 +44,8 @@ /* @name window coefficients * @{ */ -DECLARE_ALIGNED(16, extern float, ff_aac_kbd_long_1024)[1024]; -DECLARE_ALIGNED(16, extern float, ff_aac_kbd_short_128)[128]; +DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_1024)[1024]; +DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; // @} /* @name number of scalefactor window bands for long and short transform windows respectively |