diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-30 22:05:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-30 22:18:43 +0200 |
| commit | 39de8343f9274f3c93bf44ecb7dcd832b648365d (patch) | |
| tree | edea96a08f325f56b762b7f6ea103d16b2d8cd95 /libavcodec/sbr.h | |
| parent | 79e5902cf163dcb8b6539618936ff0ce28f742e4 (diff) | |
| parent | 0ca4642ec520e315692c4a8b8a98ab390bddfad2 (diff) | |
| download | ffmpeg-39de8343f9274f3c93bf44ecb7dcd832b648365d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mkv: mark corrupted packets and return them
mkv: forward EMBL block data error
avcodec: introduce YCoCg colorspace
avcodec: cosmetic cleanup on header
aac sbr: align struct member by 32 byte.
Conflicts:
libavcodec/avcodec.h
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sbr.h')
| -rw-r--r-- | libavcodec/sbr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index a9e5302836..cf4d2d82d9 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -180,7 +180,7 @@ typedef struct { ///Sinusoidal levels float s_m[7][48]; float gain[7][48]; - DECLARE_ALIGNED(16, float, qmf_filter_scratch)[5][64]; + DECLARE_ALIGNED(32, float, qmf_filter_scratch)[5][64]; FFTContext mdct_ana; FFTContext mdct; SBRDSPContext dsp; |