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/atrac1.c | |
| 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/atrac1.c')
| -rw-r--r-- | libavcodec/atrac1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index c0d2c1ff09..1855f3c545 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -79,7 +79,7 @@ typedef struct { DECLARE_ALIGNED_16(float, high[512]); float* bands[3]; DECLARE_ALIGNED_16(float, out_samples[AT1_MAX_CHANNELS][AT1_SU_SAMPLES]); - MDCTContext mdct_ctx[3]; + FFTContext mdct_ctx[3]; int channels; DSPContext dsp; } AT1Ctx; @@ -94,7 +94,7 @@ static const uint8_t mdct_long_nbits[3] = {7, 7, 8}; static void at1_imdct(AT1Ctx *q, float *spec, float *out, int nbits, int rev_spec) { - MDCTContext* mdct_context; + FFTContext* mdct_context; int transf_size = 1 << nbits; mdct_context = &q->mdct_ctx[nbits - 5 - (nbits > 6)]; |