diff options
author | Måns Rullgård <mans@mansr.com> | 2009-09-20 17:30:20 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2009-09-20 17:30:20 +0000 |
commit | 01b2214758ce2bc664bb4468f11ac0f041a337c1 (patch) | |
tree | 521c649aa1fb7c812e6db5191737cdb7ac413e7b /libavcodec/wma.h | |
parent | ec129499b85e3d33a750d49862a73c2d19f61490 (diff) | |
download | ffmpeg-01b2214758ce2bc664bb4468f11ac0f041a337c1.tar.gz |
Merge FFTContext and MDCTContext
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wma.h')
-rw-r--r-- | libavcodec/wma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wma.h b/libavcodec/wma.h index a207dfc956..6db60fafdb 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -116,7 +116,7 @@ typedef struct WMACodecContext { WMACoef coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE]; DECLARE_ALIGNED_16(float, coefs[MAX_CHANNELS][BLOCK_MAX_SIZE]); DECLARE_ALIGNED_16(FFTSample, output[BLOCK_MAX_SIZE * 2]); - MDCTContext mdct_ctx[BLOCK_NB_SIZES]; + FFTContext mdct_ctx[BLOCK_NB_SIZES]; float *windows[BLOCK_NB_SIZES]; /* output buffer for one frame and the last for IMDCT windowing */ DECLARE_ALIGNED_16(float, frame_out[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]); |