From 0d90aec0fd7428a77b5c4c536ab65635669bc42d Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Sun, 14 Mar 2004 21:14:07 +0000 Subject: sync to ffmpeg build 4707 CVS patchset: 6253 CVS date: 2004/03/14 21:14:07 --- src/libffmpeg/libavcodec/mdct.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libffmpeg/libavcodec/mdct.c') diff --git a/src/libffmpeg/libavcodec/mdct.c b/src/libffmpeg/libavcodec/mdct.c index a0f567177..6628958b6 100644 --- a/src/libffmpeg/libavcodec/mdct.c +++ b/src/libffmpeg/libavcodec/mdct.c @@ -48,7 +48,7 @@ int ff_mdct_init(MDCTContext *s, int nbits, int inverse) s->tcos[i] = -cos(alpha); s->tsin[i] = -sin(alpha); } - if (fft_init(&s->fft, s->nbits - 2, inverse) < 0) + if (ff_fft_init(&s->fft, s->nbits - 2, inverse) < 0) goto fail; return 0; fail: @@ -98,7 +98,7 @@ void ff_imdct_calc(MDCTContext *s, FFTSample *output, in1 += 2; in2 -= 2; } - fft_calc(&s->fft, z); + ff_fft_calc(&s->fft, z); /* post rotation + reordering */ /* XXX: optimize */ @@ -155,7 +155,7 @@ void ff_mdct_calc(MDCTContext *s, FFTSample *out, CMUL(x[j].re, x[j].im, re, im, -tcos[n8 + i], tsin[n8 + i]); } - fft_calc(&s->fft, x); + ff_fft_calc(&s->fft, x); /* post rotation */ for(i=0;itcos); av_freep(&s->tsin); - fft_end(&s->fft); + ff_fft_end(&s->fft); } -- cgit v1.2.3