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/aacenc.h | |
| parent | ec129499b85e3d33a750d49862a73c2d19f61490 (diff) | |
Merge FFTContext and MDCTContext
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aacenc.h')
| -rw-r--r-- | libavcodec/aacenc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 01d9836fd3..fb514ae1c0 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -49,8 +49,8 @@ extern AACCoefficientsEncoder ff_aac_coders[]; */ typedef struct AACEncContext { PutBitContext pb; - MDCTContext mdct1024; ///< long (1024 samples) frame transform context - MDCTContext mdct128; ///< short (128 samples) frame transform context + FFTContext mdct1024; ///< long (1024 samples) frame transform context + FFTContext mdct128; ///< short (128 samples) frame transform context DSPContext dsp; DECLARE_ALIGNED_16(FFTSample, output[2048]); ///< temporary buffer for MDCT input coefficients int16_t* samples; ///< saved preprocessed input |