diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-02 01:51:44 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-02 01:54:27 +0200 |
commit | 4defa68fe25eae4d7c27341e3b35811c047dcd3f (patch) | |
tree | 9d4d37343ec4c99801c1b76b813b0a5b2b04576b /libavcodec/fft.c | |
parent | a2f5e14a867768019b49b830e29801f1bfb2abb7 (diff) | |
parent | aa05f2126e18d23432bde77e6f44e41691472fef (diff) | |
download | ffmpeg-streaming-4defa68fe25eae4d7c27341e3b35811c047dcd3f.zip ffmpeg-streaming-4defa68fe25eae4d7c27341e3b35811c047dcd3f.tar.gz |
Merge remote branch 'qatar/master'
* qatar/master:
ac3enc: ARM optimised ac3_compute_matissa_size
ac3: armv6 optimised bit_alloc_calc_bap
fate: simplify fft test rules
avio: document avio_alloc_context.
lavf: make compute_chapters_end less picky.
sierravmd: fix Indeo3 videos
FFT: simplify fft8()
fate: add fixed-point fft/mdct tests
Fixed-point support in fft-test
ape: check that number of seektable entries is equal to number of frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft.c')
-rw-r--r-- | libavcodec/fft.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavcodec/fft.c b/libavcodec/fft.c index 6f08662..d12d9f7 100644 --- a/libavcodec/fft.c +++ b/libavcodec/fft.c @@ -246,21 +246,16 @@ static void fft4(FFTComplex *z) static void fft8(FFTComplex *z) { - FFTDouble t1, t2, t3, t4, t5, t6, t7, t8; + FFTDouble t1, t2, t3, t4, t5, t6; fft4(z); BF(t1, z[5].re, z[4].re, -z[5].re); BF(t2, z[5].im, z[4].im, -z[5].im); - BF(t3, z[7].re, z[6].re, -z[7].re); - BF(t4, z[7].im, z[6].im, -z[7].im); - BF(t8, t1, t3, t1); - BF(t7, t2, t2, t4); - BF(z[4].re, z[0].re, z[0].re, t1); - BF(z[4].im, z[0].im, z[0].im, t2); - BF(z[6].re, z[2].re, z[2].re, t7); - BF(z[6].im, z[2].im, z[2].im, t8); + BF(t5, z[7].re, z[6].re, -z[7].re); + BF(t6, z[7].im, z[6].im, -z[7].im); + BUTTERFLIES(z[0],z[2],z[4],z[6]); TRANSFORM(z[1],z[3],z[5],z[7],sqrthalf,sqrthalf); } |