diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-03-14 21:14:07 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-03-14 21:14:07 +0000 |
| commit | 0d90aec0fd7428a77b5c4c536ab65635669bc42d (patch) | |
| tree | 9eb56c6c1176bf6a6f3ae65199a3f43aa8c2aa2d /src/libffmpeg/libavcodec/mdct.c | |
| parent | b4d3aa3dcce07b90098e33c37b563e797378d0f1 (diff) | |
| download | xine-lib-0d90aec0fd7428a77b5c4c536ab65635669bc42d.tar.gz xine-lib-0d90aec0fd7428a77b5c4c536ab65635669bc42d.tar.bz2 | |
sync to ffmpeg build 4707
CVS patchset: 6253
CVS date: 2004/03/14 21:14:07
Diffstat (limited to 'src/libffmpeg/libavcodec/mdct.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mdct.c | 8 |
1 files changed, 4 insertions, 4 deletions
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;i<n4;i++) { @@ -171,5 +171,5 @@ void ff_mdct_end(MDCTContext *s) { av_freep(&s->tcos); av_freep(&s->tsin); - fft_end(&s->fft); + ff_fft_end(&s->fft); } |