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/sbr.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/sbr.h')
| -rw-r--r-- | libavcodec/sbr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index cf4d2d82d9..e68b3cf916 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -78,8 +78,8 @@ typedef struct { * @name State variables * @{ */ - DECLARE_ALIGNED(16, float, synthesis_filterbank_samples)[SBR_SYNTHESIS_BUF_SIZE]; - DECLARE_ALIGNED(16, float, analysis_filterbank_samples) [1312]; + DECLARE_ALIGNED(32, float, synthesis_filterbank_samples)[SBR_SYNTHESIS_BUF_SIZE]; + DECLARE_ALIGNED(32, float, analysis_filterbank_samples) [1312]; int synthesis_filterbank_samples_offset; ///l_APrev and l_A int e_a[2]; |